---

yaml
---
r: 100139
b: refs/heads/master
c: b70d9c2
h: refs/heads/master
i:
  100137: ae31f0e
  100135: 953f1bc
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6649ababd52014afaca62a12aed37d797f9f865c
+refs/heads/master: b70d9c2473ffbe327f5d7364bfbf67e94c440af8

trunk/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