Merge branch 'master' of /home/aia21/ntfs-2.6/

1 files changed, 4 insertions, 3 deletions

diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c
index e6e2f43db85e..8d8aa9d1796d 100644
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
@@ -828,6 +828,8 @@ void __init find_smp_config (void)
                 smp_scan_config(address, 0x400);
 }
 
+int es7000_plat;
+
 /* --------------------------------------------------------------------------
                             ACPI-based MP Configuration
    -------------------------------------------------------------------------- */
@@ -935,7 +937,8 @@ void __init mp_register_ioapic (
         mp_ioapics[idx].mpc_apicaddr = address;
 
         set_fixmap_nocache(FIX_IO_APIC_BASE_0 + idx, address);
-        if ((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) && (boot_cpu_data.x86 < 15))
+        if ((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)
+                && !APIC_XAPIC(apic_version[boot_cpu_physical_apicid]))
                 tmpid = io_apic_get_unique_id(idx, id);
         else
                 tmpid = id;
@@ -1011,8 +1014,6 @@ void __init mp_override_legacy_irq (
         return;
 }
 
-int es7000_plat;
-
 void __init mp_config_acpi_legacy_irqs (void)
 {
         struct mpc_config_intsrc intsrc;