diff --git a/[refs] b/[refs]
index 3e8a66260d0f..d645e4ed237d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 428929a234d2c4b8a6d0145d0dcf687fcfa27325
+refs/heads/master: 815a965b0e6d925646e1f6012175830ef21e0d21
diff --git a/trunk/include/asm-i386/smp.h b/trunk/include/asm-i386/smp.h
index 6aa1206f6e2a..bd59c1508e71 100644
--- a/trunk/include/asm-i386/smp.h
+++ b/trunk/include/asm-i386/smp.h
@@ -46,8 +46,6 @@ extern u8 x86_cpu_to_apicid[];
 
 #define cpu_physical_id(cpu)	x86_cpu_to_apicid[cpu]
 
-extern u8 apicid_2_node[];
-
 #ifdef CONFIG_HOTPLUG_CPU
 extern void cpu_exit_clear(void);
 extern void cpu_uninit(void);
@@ -101,6 +99,9 @@ extern unsigned int num_processors;
 #endif
 
 #ifndef __ASSEMBLY__
+
+extern u8 apicid_2_node[];
+
 #ifdef CONFIG_X86_LOCAL_APIC
 static __inline int logical_smp_processor_id(void)
 {