X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=arch%2Fi386%2Fkernel%2Fmpparse.c;h=8d8aa9d1796d5cdf02d9d3ccc5aff3e4b1f9ef0d;hb=7d14f145f839b5d0d221ea209b4998f93267e2ec;hp=e85e463af7ce5f759f69f594c85e0f51d25515a7;hpb=e5428ede94179ddccaa56308e0f194fa299edbb4;p=powerpc.git

diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c
index e85e463af7..8d8aa9d179 100644
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
@@ -937,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;