x86: Detect use of extended APIC ID for AMD CPUs
[linux-2.6.git] / arch / x86 / include / asm / apic.h
index 42f2f83..9b2c049 100644 (file)
@@ -410,7 +410,7 @@ static inline unsigned default_get_apic_id(unsigned long x)
 {
        unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR));
 
-       if (APIC_XAPIC(ver))
+       if (APIC_XAPIC(ver) || boot_cpu_has(X86_FEATURE_EXTD_APICID))
                return (x >> 24) & 0xFF;
        else
                return (x >> 24) & 0x0F;