From: Tony Luck Date: Tue, 16 Oct 2007 20:17:22 +0000 (-0700) Subject: [IA64] Fix build for CONFIG_SMP=n X-Git-Tag: v2.6.24-rc1~827^2 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=4d1efed540df1ccd3077df6f2bffba9d506b7d7b;p=linux-2.6-omap-h63xx.git [IA64] Fix build for CONFIG_SMP=n d5a7430ddcdb598261d70f7eb1bf450b5be52085 missed a spot where we use cpu_sibling_map and cpu_core_map. These don't exist on a uni-processor build. Wrap #ifdef CONFIG_SMP ... #endif around it. Signed-off-by: Tony Luck --- diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 777c8d8bd5e..c5cfcfa4c87 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c @@ -869,6 +869,7 @@ cpu_init (void) void *cpu_data; cpu_data = per_cpu_init(); +#ifdef CONFIG_SMP /* * insert boot cpu into sibling and core mapes * (must be done after per_cpu area is setup) @@ -877,6 +878,7 @@ cpu_init (void) cpu_set(0, per_cpu(cpu_sibling_map, 0)); cpu_set(0, cpu_core_map[0]); } +#endif /* * We set ar.k3 so that assembly code in MCA handler can compute