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

x86: unify smp_prepare_cpus 



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

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

arch/x86/kernel/smp_64.c

+1 −0
Original line number Diff line number Diff line
@@ -531,6 +531,7 @@ 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_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
@@ -867,7 +867,7 @@ static void __init smp_cpu_index_default(void) 
 * Prepare for SMP bootup.  The MP table or ACPI has been read

 * earlier.  Just do some sanity checking here and enable APIC mode.

 */

void __init smp_prepare_cpus(unsigned int max_cpus)

void __init native_smp_prepare_cpus(unsigned int max_cpus)

{

	nmi_watchdog_default();

	smp_cpu_index_default();

include/asm-x86/smp.h

+6 −0
Original line number Diff line number Diff line
@@ -29,6 +29,11 @@ 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);

}



static inline int __cpu_up(unsigned int cpu)

{

	return smp_ops.cpu_up(cpu);
@@ -47,6 +52,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);

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_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);
@@ -53,7 +49,6 @@ static inline void smp_send_stop(void) 
	smp_ops.smp_send_stop();

}



void native_smp_prepare_cpus(unsigned int max_cpus);

void native_smp_cpus_done(unsigned int max_cpus);



#ifndef CONFIG_PARAVIRT