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

x86: unify smp_cpus_done 



definition is moved to common header. x86_64 version is now called
native_smp_cpus_done

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

arch/x86/kernel/smp_64.c

+2 −0
Original line number Diff line number Diff line
@@ -532,6 +532,8 @@ asmlinkage void smp_call_function_interrupt(void) 
struct smp_ops smp_ops = {

	.smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,

	.smp_prepare_cpus = native_smp_prepare_cpus,

	.smp_cpus_done = native_smp_cpus_done,



	.smp_send_reschedule = native_smp_send_reschedule,

	.smp_call_function_mask = native_smp_call_function_mask,

	.cpu_up = native_cpu_up,

arch/x86/kernel/smpboot_64.c

+1 −1
Original line number Diff line number Diff line
@@ -987,7 +987,7 @@ int __cpuinit native_cpu_up(unsigned int cpu) 
/*

 * Finish the SMP boot.

 */

void __init smp_cpus_done(unsigned int max_cpus)

void __init native_smp_cpus_done(unsigned int max_cpus)

{

	smp_cleanup_boot();

	setup_ioapic_dest();

include/asm-x86/smp.h

+6 −0
Original line number Diff line number Diff line
@@ -34,6 +34,11 @@ static inline void smp_prepare_cpus(unsigned int max_cpus) 
	smp_ops.smp_prepare_cpus(max_cpus);

}



static inline void smp_cpus_done(unsigned int max_cpus)

{

	smp_ops.smp_cpus_done(max_cpus);

}



static inline int __cpu_up(unsigned int cpu)

{

	return smp_ops.cpu_up(cpu);
@@ -53,6 +58,7 @@ static inline int smp_call_function_mask(cpumask_t mask, 


void native_smp_prepare_boot_cpu(void);

void native_smp_prepare_cpus(unsigned int max_cpus);

void native_smp_cpus_done(unsigned int max_cpus);

int native_cpu_up(unsigned int cpunum);

#endif

include/asm-x86/smp_32.h

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



#ifdef CONFIG_SMP

static inline void smp_cpus_done(unsigned int max_cpus)

{

	smp_ops.smp_cpus_done(max_cpus);

}



static inline void smp_send_stop(void)

{

	smp_ops.smp_send_stop();

}



void native_smp_cpus_done(unsigned int max_cpus);



#ifndef CONFIG_PARAVIRT

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

#endif