Commit 377d6984 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: unify smp_send_stop 



function definition is moved to common header.
x86_64 version is now called native_smp_send_stop

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

arch/x86/kernel/smp_64.c

+2 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ static void stop_this_cpu(void *dummy) 
	for (;;);

}



void smp_send_stop(void)

void native_smp_send_stop(void)

{

	int nolock;

	unsigned long flags;
@@ -482,6 +482,7 @@ struct smp_ops smp_ops = { 
	.smp_prepare_cpus = native_smp_prepare_cpus,

	.smp_cpus_done = native_smp_cpus_done,



	.smp_send_stop = native_smp_send_stop,

	.smp_send_reschedule = native_smp_send_reschedule,

	.smp_call_function_mask = native_smp_call_function_mask,

	.cpu_up = native_cpu_up,

include/asm-x86/smp.h

+5 −0
Original line number Diff line number Diff line
@@ -25,6 +25,11 @@ struct smp_ops { 
#ifdef CONFIG_SMP

extern struct smp_ops smp_ops;



static inline void smp_send_stop(void)

{

	smp_ops.smp_send_stop();

}



static inline void smp_prepare_boot_cpu(void)

{

	smp_ops.smp_prepare_boot_cpu();

include/asm-x86/smp_32.h

+0 −5
Original line number Diff line number Diff line
@@ -39,11 +39,6 @@ extern void remove_siblinginfo(int cpu); 
extern void set_cpu_sibling_map(int cpu);



#ifdef CONFIG_SMP

static inline void smp_send_stop(void)

{

	smp_ops.smp_send_stop();

}



#ifndef CONFIG_PARAVIRT

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

#endif