x86: cleanup smp.h variants

Bring the smp.h variants into sync to prepare merging and
paravirt support.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
diff --git a/include/asm-x86/mpspec.h b/include/asm-x86/mpspec.h
index a2a6b2e..781ad74 100644
--- a/include/asm-x86/mpspec.h
+++ b/include/asm-x86/mpspec.h
@@ -13,8 +13,11 @@
 
 extern unsigned int def_to_bigsmp;
 extern int apic_version[MAX_APICS];
+extern u8 apicid_2_node[];
 extern int pic_mode;
 
+#define MAX_APICID 256
+
 #else
 
 #define MAX_MP_BUSSES 256