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

Commit 0450193b authored by Yinghai Lu's avatar Yinghai Lu Committed by Thomas Gleixner
Browse files

x86, x2apic: Don't map lapic addr for preenabled x2apic systems 



If x2apic is preenabled and used by the kernel, we don't need to map
the lapic address. That mapping will never be used.

So just skip that in register_lapic_address()

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
LKML-Reference: <4CFDF69C.9070501@kernel.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 53301f36

arch/x86/kernel/apic/apic.c

+5 −3
Original line number Diff line number Diff line
@@ -1681,9 +1681,11 @@ void __init register_lapic_address(unsigned long address) 
{

	mp_lapic_addr = address;



	if (!x2apic_mode) {

		set_fixmap_nocache(FIX_APIC_BASE, address);

		apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n",

			    APIC_BASE, mp_lapic_addr);

	}

	if (boot_cpu_physical_apicid == -1U) {

		boot_cpu_physical_apicid  = read_apic_id();

		apic_version[boot_cpu_physical_apicid] =