diff --git a/[refs] b/[refs]
index 83952f91ad16..0eed11ed6135 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 288621e32a7ae3a29c37b45297136c0264e2ff7b
+refs/heads/master: 9b967106da0357ef8b08847dce35584a04134f20
diff --git a/trunk/include/asm-x86/mach-default/mach_apicdef.h b/trunk/include/asm-x86/mach-default/mach_apicdef.h
index 7b78275e6d33..e4b29ba37de6 100644
--- a/trunk/include/asm-x86/mach-default/mach_apicdef.h
+++ b/trunk/include/asm-x86/mach-default/mach_apicdef.h
@@ -5,13 +5,12 @@
 
 #ifdef CONFIG_X86_64
 #define	APIC_ID_MASK		(0xFFu<<24)
+#define GET_APIC_ID(x)          (((x)>>24)&0xFFu)
 #define	SET_APIC_ID(x)		(((x)<<24))
 #else
 #define		APIC_ID_MASK		(0xF<<24)
-#endif
-
 static inline unsigned get_apic_id(unsigned long x) 
-{ 
+{
 	unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR));
 	if (APIC_XAPIC(ver))
 		return (((x)>>24)&0xFF);
@@ -20,5 +19,6 @@ static inline unsigned get_apic_id(unsigned long x)
 } 
 
 #define		GET_APIC_ID(x)	get_apic_id(x)
+#endif
 
 #endif