commit dd5af90a7f3d79e04b7eace9a98644dbf2038f4d
author Mike Travis <travis@sgi.com> Wed Jan 30 13:33:32 2008 +0100
committer Ingo Molnar <mingo@elte.hu> Wed Jan 30 13:33:32 2008 +0100
tree 22327ba385c830b7be391c76821dc5ec26863f2e
parent 3212bff370c2f22e4987c6679ba485654cefb178

x86/non-x86: percpu, node ids, apic ids x86.git fixup

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

init/main.c

diff --git a/init/main.c b/init/main.c
index 5843fe9..3316dff 100644
--- a/init/main.c
+++ b/init/main.c
@@ -363,7 +363,7 @@
 
 #else
 
-#ifndef CONFIG_ARCH_SETS_UP_PER_CPU_AREA
+#ifndef CONFIG_HAVE_SETUP_PER_CPU_AREA
 unsigned long __per_cpu_offset[NR_CPUS] __read_mostly;
 
 EXPORT_SYMBOL(__per_cpu_offset);
@@ -384,7 +384,7 @@
 		ptr += size;
 	}
 }
-#endif /* CONFIG_ARCH_SETS_UP_CPU_AREA */
+#endif /* CONFIG_HAVE_SETUP_PER_CPU_AREA */
 
 /* Called by boot processor to activate the rest. */
 static void __init smp_init(void)