1 files changed, 1 insertions, 1 deletions

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 980508c79082..e3b534cda49a 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1606,7 +1606,7 @@ void __init init_apic_mappings(void)
                  * acpi lapic path already maps that address in
                  * acpi_register_lapic_address()
                  */
-                if (!acpi_lapic)
+                if (!acpi_lapic && !smp_found_config)
                         set_fixmap_nocache(FIX_APIC_BASE, apic_phys);
 
                 apic_printk(APIC_VERBOSE, "mapped APIC to %08lx (%08lx)\n",