aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/apic/apic.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 3fc3a6c428da..159740decc41 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1562,8 +1562,6 @@ no_apic:
1562#ifdef CONFIG_X86_64 1562#ifdef CONFIG_X86_64
1563void __init early_init_lapic_mapping(void) 1563void __init early_init_lapic_mapping(void)
1564{ 1564{
1565 unsigned long phys_addr;
1566
1567 /* 1565 /*
1568 * If no local APIC can be found then go out 1566 * If no local APIC can be found then go out
1569 * : it means there is no mpatable and MADT 1567 * : it means there is no mpatable and MADT
@@ -1571,11 +1569,9 @@ void __init early_init_lapic_mapping(void)
1571 if (!smp_found_config) 1569 if (!smp_found_config)
1572 return; 1570 return;
1573 1571
1574 phys_addr = mp_lapic_addr; 1572 set_fixmap_nocache(FIX_APIC_BASE, mp_lapic_addr);
1575
1576 set_fixmap_nocache(FIX_APIC_BASE, phys_addr);
1577 apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n", 1573 apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n",
1578 APIC_BASE, phys_addr); 1574 APIC_BASE, mp_lapic_addr);
1579 1575
1580 /* 1576 /*
1581 * Fetch the APIC ID of the BSP in case we have a 1577 * Fetch the APIC ID of the BSP in case we have a