diff --git a/[refs] b/[refs] index fe20f825c3ed..b3268a83e080 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96f874e26428ab5d2db681c100210c254775e154 +refs/heads/master: bf4d83f66476086c6b50dc52aac00d71ad70494e diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index eba6a156d334..1aa840a9f585 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -8349,10 +8349,12 @@ void __init sched_init(void) /* Allocate the nohz_cpu_mask if CONFIG_CPUMASK_OFFSTACK */ alloc_bootmem_cpumask_var(&nohz_cpu_mask); +#ifdef CONFIG_SMP #ifdef CONFIG_NO_HZ alloc_bootmem_cpumask_var(&nohz.cpu_mask); #endif alloc_bootmem_cpumask_var(&cpu_isolated_map); +#endif /* SMP */ scheduler_running = 1; }