1 files changed, 17 insertions, 5 deletions

diff --git a/include/asm-x86/mach-visws/mach_apicdef.h b/include/asm-x86/mach-visws/mach_apicdef.h
index 826cfa97d778..e4b29ba37de6 100644
--- a/include/asm-x86/mach-visws/mach_apicdef.h
+++ b/include/asm-x86/mach-visws/mach_apicdef.h
@@ -1,12 +1,24 @@
 #ifndef __ASM_MACH_APICDEF_H
 #define __ASM_MACH_APICDEF_H
 
-#define         APIC_ID_MASK            (0xF<<24)
+#include <asm/apic.h>
 
-static inline unsigned get_apic_id(unsigned long x)
+#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) 
 {
-                return (((x)>>24)&0xF);
-}
-#define         GET_APIC_ID(x)  get_apic_id(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