diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 17:08:30 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 17:08:30 +0100 |
| commit | 063402356280a7b262952d6351d21315336f657b (patch) | |
| tree | e6fae7db15d0f4cbb9b9b7aa2b5bc176b4bf60f5 /mm/Makefile | |
| parent | f9a36fa5413f1b2694841c410a6fdb4666e78f16 (diff) | |
| parent | a98fe7f3425c6b4e90de16f8da63b0429a8fed08 (diff) | |
| download | linux-063402356280a7b262952d6351d21315336f657b.tar.gz | |
Merge branch 'x86/core' into x86/kconfig
Diffstat (limited to 'mm/Makefile')
| -rw-r--r-- | mm/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mm/Makefile b/mm/Makefile index 72255be57f89..818569b68f46 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -30,6 +30,10 @@ obj-$(CONFIG_FAILSLAB) += failslab.o obj-$(CONFIG_MEMORY_HOTPLUG) += memory_hotplug.o obj-$(CONFIG_FS_XIP) += filemap_xip.o obj-$(CONFIG_MIGRATION) += migrate.o +ifdef CONFIG_HAVE_DYNAMIC_PER_CPU_AREA +obj-$(CONFIG_SMP) += percpu.o +else obj-$(CONFIG_SMP) += allocpercpu.o +endif obj-$(CONFIG_QUICKLIST) += quicklist.o obj-$(CONFIG_CGROUP_MEM_RES_CTLR) += memcontrol.o page_cgroup.o |