]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
[IA64] Fix build for CONFIG_SMP=n
authorTony Luck <tony.luck@intel.com>
Tue, 16 Oct 2007 20:17:22 +0000 (13:17 -0700)
committerTony Luck <tony.luck@intel.com>
Tue, 16 Oct 2007 20:17:22 +0000 (13:17 -0700)
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 <tony.luck@intel.com>
arch/ia64/kernel/setup.c

index 777c8d8bd5e70febf80c8e5a8ed0c5d94d85de40..c5cfcfa4c87c1ae92db64feeda71039cd529e245 100644 (file)
@@ -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