path: root/kernel
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-22 21:18:12 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-22 21:18:12 -0700
commit31950eb66ff47c946fd9c65c2f8c94b6b7ba13fc (patch)
tree1ab1e09bbe7a0b33bbf19dd725172827bac5bb88 /kernel
parentac1b7c378ef26fba6694d5f118fe7fc16fee2fe2 (diff)
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 'kernel')
1 files changed, 5 insertions, 8 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 395b6974dc8..8ce10043e4a 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -34,14 +34,11 @@ static struct {
* an ongoing cpu hotplug operation.
int refcount;
-} cpu_hotplug;
-void __init cpu_hotplug_init(void)
- cpu_hotplug.active_writer = NULL;
- mutex_init(&cpu_hotplug.lock);
- cpu_hotplug.refcount = 0;
+} cpu_hotplug = {
+ .active_writer = NULL,
+ .lock = __MUTEX_INITIALIZER(cpu_hotplug.lock),
+ .refcount = 0,