1 files changed, 5 insertions, 1 deletions

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 678d0b8c26f3..b2ebcba729d9 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -241,6 +241,11 @@ static void __cpuinit smp_callin(void)
         map_cpu_to_logical_apicid();
 
         notify_cpu_starting(cpuid);
+
+        /*
+         * Need to setup vector mappings before we enable interrupts.
+         */
+        __setup_vector_irq(smp_processor_id());
         /*
          * Get our bogomips.
          *
@@ -315,7 +320,6 @@ notrace static void __cpuinit start_secondary(void *unused)
          */
         ipi_call_lock();
         lock_vector_lock();
-        __setup_vector_irq(smp_processor_id());
         set_cpu_online(smp_processor_id(), true);
         unlock_vector_lock();
         ipi_call_unlock();