diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-23 00:18:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-23 00:18:12 -0400 |
commit | 31950eb66ff47c946fd9c65c2f8c94b6b7ba13fc (patch) | |
tree | 1ab1e09bbe7a0b33bbf19dd725172827bac5bb88 /include | |
parent | ac1b7c378ef26fba6694d5f118fe7fc16fee2fe2 (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 'include')
-rw-r--r-- | include/linux/cpu.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 2643d848df90..4d668e05d458 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h | |||
@@ -69,7 +69,6 @@ static inline void unregister_cpu_notifier(struct notifier_block *nb) | |||
69 | 69 | ||
70 | int cpu_up(unsigned int cpu); | 70 | int cpu_up(unsigned int cpu); |
71 | void notify_cpu_starting(unsigned int cpu); | 71 | void notify_cpu_starting(unsigned int cpu); |
72 | extern void cpu_hotplug_init(void); | ||
73 | extern void cpu_maps_update_begin(void); | 72 | extern void cpu_maps_update_begin(void); |
74 | extern void cpu_maps_update_done(void); | 73 | extern void cpu_maps_update_done(void); |
75 | 74 | ||
@@ -84,10 +83,6 @@ static inline void unregister_cpu_notifier(struct notifier_block *nb) | |||
84 | { | 83 | { |
85 | } | 84 | } |
86 | 85 | ||
87 | static inline void cpu_hotplug_init(void) | ||
88 | { | ||
89 | } | ||
90 | |||
91 | static inline void cpu_maps_update_begin(void) | 86 | static inline void cpu_maps_update_begin(void) |
92 | { | 87 | { |
93 | } | 88 | } |