Commit d0173aea authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar
Browse files

x86: use start_ipi_hook in x86_64 



It is used to match i386. The definition for the non-paravirt
case is moved to smp.h instead of smp_32.h

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 1af8a0c1

arch/x86/kernel/smpboot_64.c

+8 −0
Original line number Diff line number Diff line
@@ -344,6 +344,14 @@ static int __cpuinit wakeup_secondary_via_INIT(int phys_apicid, unsigned int sta 


	num_starts = 2;



	/*

	 * Paravirt / VMI wants a startup IPI hook here to set up the

	 * target processor state.

	 */

	startup_ipi_hook(phys_apicid, (unsigned long) start_secondary,

			(unsigned long) init_rsp);





	/*

	 * Run STARTUP IPI loop.

	 */

include/asm-x86/smp.h

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ struct smp_ops { 
extern void set_cpu_sibling_map(int cpu);



#ifdef CONFIG_SMP

#ifndef CONFIG_PARAVIRT

#define startup_ipi_hook(phys_apicid, start_eip, start_esp) do { } while (0)

#endif

extern struct smp_ops smp_ops;



static inline void smp_send_stop(void)

include/asm-x86/smp_32.h

+0 −4
Original line number Diff line number Diff line
@@ -30,10 +30,6 @@ DECLARE_PER_CPU(u16, cpu_llc_id); 
DECLARE_PER_CPU(u16, x86_cpu_to_apicid);



#ifdef CONFIG_SMP

#ifndef CONFIG_PARAVIRT

#define startup_ipi_hook(phys_apicid, start_eip, start_esp) do { } while (0)

#endif



/*

 * This function is needed by all SMP systems. It must _always_ be valid

 * from the initial startup. We map APIC_BASE very early in page_setup(),