Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c5c1e42 authored by Shaohua Li's avatar Shaohua Li Committed by Linus Torvalds
Browse files

[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: default avatarShaohua <Li&lt;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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f2d0d263

arch/i386/kernel/io_apic.c

+2 −1
Original line number Diff line number Diff line
@@ -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

arch/i386/kernel/mpparse.c

+2 −1
Original line number Diff line number Diff line
@@ -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;