diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-01-12 11:08:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-01-12 11:08:13 +0100 |
| commit | c0c57019a65341f08858541d2740b74dee821cf1 (patch) | |
| tree | 584ac03f7dfa26c9c45c3d66ad306222e893fa33 /arch/x86/lib/Makefile | |
| parent | x86/boot: Double BOOT_HEAP_SIZE to 64KB (diff) | |
| parent | Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| download | linux-c0c57019a65341f08858541d2740b74dee821cf1.tar.xz linux-c0c57019a65341f08858541d2740b74dee821cf1.zip | |
Merge commit 'linus' into x86/urgent, to pick up recent x86 changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/lib/Makefile')
| -rw-r--r-- | arch/x86/lib/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index f2587888d987..a501fa25da41 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -16,7 +16,7 @@ clean-files := inat-tables.c obj-$(CONFIG_SMP) += msr-smp.o cache-smp.o -lib-y := delay.o misc.o cmdline.o +lib-y := delay.o misc.o cmdline.o cpu.o lib-y += usercopy_$(BITS).o usercopy.o getuser.o putuser.o lib-y += memcpy_$(BITS).o lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o |