[PATCH 1/3] Fix commits 7d1e6a9b and dcc30a35 for UP build

From: Rusty Russell
Date: Mon Nov 24 2008 - 18:33:26 EST


My recent patches were not tested against CONFIG_SMP=n.

Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>

diff --git a/kernel/sched.c b/kernel/sched.c
index eba6a15..1aa840a 100644
--- a/kernel/sched.c
+++ b/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;
}

¢éì®&Þ~º&¶¬–+-±éÝ¥Šw®žË±Êâmébžìdz¹Þ)í…æèw*jg¬±¨¶‰šŽŠÝj/êäz¹ÞŠà2ŠÞ¨è­Ú&¢)ß«a¶Úþø®G«éh®æj:+v‰¨Šwè†Ù>Wš±êÞiÛaxPjØm¶Ÿÿà -»+ƒùdš_