diff options
| author | Tejun Heo <tj@kernel.org> | 2010-03-24 09:06:43 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-03-30 15:02:32 +0200 |
| commit | de380b55f92986c1a84198149cb71b7228d15fbd (patch) | |
| tree | dce7168802e1e65754c9b6455d0527dfa853168c /mm/Makefile | |
| parent | kmemcheck: Fix build errors due to missing slab.h (diff) | |
| download | linux-de380b55f92986c1a84198149cb71b7228d15fbd.tar.xz linux-de380b55f92986c1a84198149cb71b7228d15fbd.zip | |
percpu: don't implicitly include slab.h from percpu.h
percpu.h has always been including slab.h to get k[mz]alloc/free() for
UP inline implementation. percpu.h being used by very low level
headers including module.h and sched.h, this meant that a lot files
unintentionally got slab.h inclusion.
Lee Schermerhorn was trying to make topology.h use percpu.h and got
bitten by this implicit inclusion. The right thing to do is break
this ultimately unnecessary dependency. The previous patch added
explicit inclusion of either gfp.h or slab.h to the source files using
them. This patch updates percpu.h such that slab.h is no longer
included from percpu.h.
Signed-off-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
Diffstat (limited to 'mm/Makefile')
| -rw-r--r-- | mm/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mm/Makefile b/mm/Makefile index 7a68d2ab5560..6c2a73a54a43 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -33,7 +33,11 @@ obj-$(CONFIG_FAILSLAB) += failslab.o obj-$(CONFIG_MEMORY_HOTPLUG) += memory_hotplug.o obj-$(CONFIG_FS_XIP) += filemap_xip.o obj-$(CONFIG_MIGRATION) += migrate.o -obj-$(CONFIG_SMP) += percpu.o +ifdef CONFIG_SMP +obj-y += percpu.o +else +obj-y += percpu_up.o +endif obj-$(CONFIG_QUICKLIST) += quicklist.o obj-$(CONFIG_CGROUP_MEM_RES_CTLR) += memcontrol.o page_cgroup.o obj-$(CONFIG_MEMORY_FAILURE) += memory-failure.o |