summaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-23 06:18:12 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-23 06:18:12 +0200
commit31950eb66ff47c946fd9c65c2f8c94b6b7ba13fc (patch)
tree1ab1e09bbe7a0b33bbf19dd725172827bac5bb88 /init/main.c
parentMerge git://git.infradead.org/mtd-2.6 (diff)
downloadlinux-31950eb66ff47c946fd9c65c2f8c94b6b7ba13fc.tar.xz
linux-31950eb66ff47c946fd9c65c2f8c94b6b7ba13fc.zip
mm/init: cpu_hotplug_init() must be initialized before SLAB
SLAB uses get/put_online_cpus() which use a mutex which is itself only initialized when cpu_hotplug_init() is called. Currently we hang suring boot in SLAB due to doing that too late. Reported by James Bottomley and Sachin Sant (and possibly others). Debugged by Benjamin Herrenschmidt. This just removes the dynamic initialization of the data structures, and replaces it with a static one, avoiding this dependency entirely, and removing one unnecessary special initcall. Tested-by: Sachin Sant <sachinp@in.ibm.com> Tested-by: James Bottomley <James.Bottomley@HansenPartnership.com> Tested-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c
index 09131ec090c1..4870dfeb9ee5 100644
--- a/init/main.c
+++ b/init/main.c
@@ -678,7 +678,6 @@ asmlinkage void __init start_kernel(void)
#endif
page_cgroup_init();
enable_debug_pagealloc();
- cpu_hotplug_init();
kmemtrace_init();
kmemleak_init();
debug_objects_mem_init();