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: Yinghai 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: Thomas Gleixner <tglx@linutronix.de>

authored by Yinghai Lu and committed by Thomas Gleixner 0450193b 53301f36

+5 -3
+5 -3
arch/x86/kernel/apic/apic.c
··· 1681 1681 { 1682 1682 mp_lapic_addr = address; 1683 1683 1684 - set_fixmap_nocache(FIX_APIC_BASE, address); 1685 - apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n", 1686 - APIC_BASE, mp_lapic_addr); 1684 + if (!x2apic_mode) { 1685 + set_fixmap_nocache(FIX_APIC_BASE, address); 1686 + apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n", 1687 + APIC_BASE, mp_lapic_addr); 1688 + } 1687 1689 if (boot_cpu_physical_apicid == -1U) { 1688 1690 boot_cpu_physical_apicid = read_apic_id(); 1689 1691 apic_version[boot_cpu_physical_apicid] =