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

x86: unify prepare_boot_cpu 



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

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

arch/x86/kernel/smp_64.c

+1 −0
Original line number Diff line number Diff line
@@ -530,6 +530,7 @@ asmlinkage void smp_call_function_interrupt(void) 
}



struct smp_ops smp_ops = {

	.smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,

	.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
@@ -918,7 +918,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 
/*

 * Early setup to make printk work.

 */

void __init smp_prepare_boot_cpu(void)

void __init native_smp_prepare_boot_cpu(void)

{

	int me = smp_processor_id();

	/* already set me in cpu_online_map in boot_cpu_init() */

include/asm-x86/smp.h

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

extern struct smp_ops smp_ops;



static inline void smp_prepare_boot_cpu(void)

{

	smp_ops.smp_prepare_boot_cpu();

}



static inline int __cpu_up(unsigned int cpu)

{

	return smp_ops.cpu_up(cpu);
@@ -41,6 +46,7 @@ static inline int smp_call_function_mask(cpumask_t mask, 
	return smp_ops.smp_call_function_mask(mask, func, info, wait);

}



void native_smp_prepare_boot_cpu(void);

int native_cpu_up(unsigned int cpunum);

#endif

include/asm-x86/smp_32.h

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



#ifdef CONFIG_SMP

static inline void smp_prepare_boot_cpu(void)

{

	smp_ops.smp_prepare_boot_cpu();

}

static inline void smp_prepare_cpus(unsigned int max_cpus)

{

	smp_ops.smp_prepare_cpus(max_cpus);
@@ -57,7 +53,6 @@ static inline void smp_send_stop(void) 
	smp_ops.smp_send_stop();

}



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);