summaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/io_apic.c
diff options
context:
space:
mode:
authorShaohua Li <shaohua.li@intel.com>2006-03-23 02:59:53 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-23 07:38:06 -0800
commit7c5c1e427b5e83807fd05419d1cf6991b9d87247 (patch)
tree780820efe1aa9ef26e756c157b14de9d3f84649f /arch/i386/kernel/io_apic.c
parentf2d0d263b51d13efe55f0aae9254b69ba2855f1c (diff)
downloadop-kernel-dev-7c5c1e427b5e83807fd05419d1cf6991b9d87247.zip
op-kernel-dev-7c5c1e427b5e83807fd05419d1cf6991b9d87247.tar.gz
[PATCH] x86: deterine xapic using apic version
Checking APIC version instead of CPU family to determine XAPIC. Family 6 CPU could have xapic as well. Signed-off-by: Shaohua Li<shaohua.li@intel.com> Cc: Dave Jones <davej@codemonkey.org.uk> Cc: "Seth, Rohit" <rohit.seth@intel.com> Cc: Andi Kleen <ak@muc.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/kernel/io_apic.c')
-rw-r--r--arch/i386/kernel/io_apic.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c
index 39d9a5f..fd1c60c 100644
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@ -1761,7 +1761,8 @@ static void __init setup_ioapic_ids_from_mpc(void)
* 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
OpenPOWER on IntegriCloud