2 files changed, 9 insertions, 1 deletions

diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 80c81c76625a..6f506020bd7d 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -1064,9 +1064,13 @@ void __cpuinit setup_local_APIC(void)
         if (!integrated)                /* 82489DX */
                 value |= APIC_LVT_LEVEL_TRIGGER;
         apic_write_around(APIC_LVT1, value);
+}
 
-        lapic_setup_esr();
+void __cpuinit end_local_APIC_setup(void)
+{
+        unsigned long value;
 
+        lapic_setup_esr();
         /* Disable the local apic timer */
         value = apic_read(APIC_LVTT);
         value |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);
@@ -1256,6 +1260,7 @@ int __init APIC_init_uniprocessor(void)
 
         setup_local_APIC();
 
+        end_local_APIC_setup();
 #ifdef CONFIG_X86_IO_APIC
         if (smp_found_config)
                 if (!skip_ioapic_setup && nr_ioapics)
diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c
index c03596e11db8..dbfaeb30a69a 100644
--- a/arch/x86/kernel/smpboot_32.c
+++ b/arch/x86/kernel/smpboot_32.c
@@ -161,6 +161,7 @@ static void __cpuinit smp_callin(void)
         Dprintk("CALLIN, before setup_local_APIC().\n");
         smp_callin_clear_local_apic();
         setup_local_APIC();
+        end_local_APIC_setup();
         map_cpu_to_logical_apicid();
 
         /*
@@ -780,6 +781,7 @@ static int __init smp_sanity_check(unsigned max_cpus)
                         printk(KERN_INFO "activating minimal APIC for NMI watchdog use.\n");
                         connect_bsp_APIC();
                         setup_local_APIC();
+                        end_local_APIC_setup();
                 }
                 return -1;
         }
@@ -813,6 +815,7 @@ static void __init smp_boot_cpus(unsigned int max_cpus)
 
         connect_bsp_APIC();
         setup_local_APIC();
+        end_local_APIC_setup();
         map_cpu_to_logical_apicid();