Checking APIC version instead of CPU family to determine XAPIC. Family 6
CPU could have xapic as well.
Signed-off-by: Shaohua Li<[email protected]>
---
linux-2.6.16-rc5-root/arch/i386/kernel/io_apic.c | 3 ++-
linux-2.6.16-rc5-root/arch/i386/kernel/mpparse.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff -puN arch/i386/kernel/io_apic.c~xapic_id arch/i386/kernel/io_apic.c
--- linux-2.6.16-rc5/arch/i386/kernel/io_apic.c~xapic_id 2006-03-02 10:46:36.000000000 +0800
+++ linux-2.6.16-rc5-root/arch/i386/kernel/io_apic.c 2006-03-05 07:26:48.000000000 +0800
@@ -1759,7 +1759,8 @@ static void __init setup_ioapic_ids_from
* Don't check I/O APIC IDs for xAPIC systems. They have
* no meaning without the serial APIC bus.
*/
- 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]))
return;
/*
* This is broken; anything with a real cpu count has to
diff -puN arch/i386/kernel/mpparse.c~xapic_id arch/i386/kernel/mpparse.c
--- linux-2.6.16-rc5/arch/i386/kernel/mpparse.c~xapic_id 2006-03-05 07:23:25.000000000 +0800
+++ linux-2.6.16-rc5-root/arch/i386/kernel/mpparse.c 2006-03-05 07:27:09.000000000 +0800
@@ -935,7 +935,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;
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
