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

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
...@@ -1681,9 +1681,11 @@ void __init register_lapic_address(unsigned long address) ...@@ -1681,9 +1681,11 @@ void __init register_lapic_address(unsigned long address)
{ {
mp_lapic_addr = address; mp_lapic_addr = address;
if (!x2apic_mode) {
set_fixmap_nocache(FIX_APIC_BASE, address); set_fixmap_nocache(FIX_APIC_BASE, address);
apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n", apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n",
APIC_BASE, mp_lapic_addr); APIC_BASE, mp_lapic_addr);
}
if (boot_cpu_physical_apicid == -1U) { if (boot_cpu_physical_apicid == -1U) {
boot_cpu_physical_apicid = read_apic_id(); boot_cpu_physical_apicid = read_apic_id();
apic_version[boot_cpu_physical_apicid] = apic_version[boot_cpu_physical_apicid] =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment