diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2009-11-02 05:07:20 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-11-02 09:48:54 -0500 |
commit | 49557e620339cb134127b5bfbcfecc06b77d0232 (patch) | |
tree | a2a73c84a384243a63c1b8e8462c39381d5ef98e | |
parent | f685ceacab07d3f6c236f04803e2f2f0dbcc5afb (diff) |
sched: Fix boot crash by zalloc()ing most of the cpu masks
I got a boot crash when forcing cpumasks offstack on 32 bit,
because find_new_ilb() returned 3 on my UP system (nohz.cpu_mask
wasn't zeroed).
AFAICT the others need to be zeroed too: only
nohz.ilb_grp_nohz_mask is initialized before use.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <200911022037.21282.rusty@rustcorp.com.au>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | kernel/sched.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index cae6700bedb3..bf21adb6c9fc 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -9535,13 +9535,13 @@ void __init sched_init(void) | |||
9535 | current->sched_class = &fair_sched_class; | 9535 | current->sched_class = &fair_sched_class; |
9536 | 9536 | ||
9537 | /* Allocate the nohz_cpu_mask if CONFIG_CPUMASK_OFFSTACK */ | 9537 | /* Allocate the nohz_cpu_mask if CONFIG_CPUMASK_OFFSTACK */ |
9538 | alloc_cpumask_var(&nohz_cpu_mask, GFP_NOWAIT); | 9538 | zalloc_cpumask_var(&nohz_cpu_mask, GFP_NOWAIT); |
9539 | #ifdef CONFIG_SMP | 9539 | #ifdef CONFIG_SMP |
9540 | #ifdef CONFIG_NO_HZ | 9540 | #ifdef CONFIG_NO_HZ |
9541 | alloc_cpumask_var(&nohz.cpu_mask, GFP_NOWAIT); | 9541 | zalloc_cpumask_var(&nohz.cpu_mask, GFP_NOWAIT); |
9542 | alloc_cpumask_var(&nohz.ilb_grp_nohz_mask, GFP_NOWAIT); | 9542 | alloc_cpumask_var(&nohz.ilb_grp_nohz_mask, GFP_NOWAIT); |
9543 | #endif | 9543 | #endif |
9544 | alloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT); | 9544 | zalloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT); |
9545 | #endif /* SMP */ | 9545 | #endif /* SMP */ |
9546 | 9546 | ||
9547 | perf_event_init(); | 9547 | perf_event_init(); |