diff options
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 7 | 
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index a02e80c3c54..763d815e27a 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -49,6 +49,7 @@  #include <linux/nmi.h>  #include <linux/tboot.h>  #include <linux/stackprotector.h> +#include <linux/gfp.h>  #include <asm/acpi.h>  #include <asm/desc.h> @@ -242,12 +243,10 @@ static void __cpuinit smp_callin(void)  	end_local_APIC_setup();  	map_cpu_to_logical_apicid(); -	notify_cpu_starting(cpuid); -  	/*  	 * Need to setup vector mappings before we enable interrupts.  	 */ -	__setup_vector_irq(smp_processor_id()); +	setup_vector_irq(smp_processor_id());  	/*  	 * Get our bogomips.  	 * @@ -264,6 +263,8 @@ static void __cpuinit smp_callin(void)  	 */  	smp_store_cpu_info(cpuid); +	notify_cpu_starting(cpuid); +  	/*  	 * Allow the master to continue.  	 */  |