diff --git a/[refs] b/[refs]
index 2bab3a6d0eb9..ad4f292f3e76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b70d9c2473ffbe327f5d7364bfbf67e94c440af8
+refs/heads/master: 18c413e27e1585358cedc22e450847e3240006ff
diff --git a/trunk/include/asm-x86/mach-visws/mach_apicdef.h b/trunk/include/asm-x86/mach-visws/mach_apicdef.h
index e4b29ba37de6..42711d152a93 100644
--- a/trunk/include/asm-x86/mach-visws/mach_apicdef.h
+++ b/trunk/include/asm-x86/mach-visws/mach_apicdef.h
@@ -1,24 +1 @@
-#ifndef __ASM_MACH_APICDEF_H
-#define __ASM_MACH_APICDEF_H
-
-#include <asm/apic.h>
-
-#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)
-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);
-	else
-		return (((x)>>24)&0xF);
-} 
-
-#define		GET_APIC_ID(x)	get_apic_id(x)
-#endif
-
-#endif
+#include "../mach-default/mach_apicdef.h"