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

x86: unify smp_call_function_mask 



definition is moved to common header, x86_64 function name
now is native_smp_call_function_mask

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

arch/x86/kernel/smp_64.c

+4 −3
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ static int __smp_call_function_mask(cpumask_t mask, 
 * You must not call this function with disabled interrupts or from a

 * hardware interrupt handler or from a bottom half handler.

 */

int smp_call_function_mask(cpumask_t mask,

int native_smp_call_function_mask(cpumask_t mask,

				  void (*func)(void *), void *info,

				  int wait)

{
@@ -531,5 +531,6 @@ asmlinkage void smp_call_function_interrupt(void) 


struct smp_ops smp_ops = {

	.smp_send_reschedule = native_smp_send_reschedule,

	.smp_call_function_mask = native_smp_call_function_mask,

};

EXPORT_SYMBOL_GPL(smp_ops);

include/asm-x86/smp.h

+7 −0
Original line number Diff line number Diff line
@@ -28,6 +28,13 @@ static inline void smp_send_reschedule(int cpu) 
{

	smp_ops.smp_send_reschedule(cpu);

}



static inline int smp_call_function_mask(cpumask_t mask,

					 void (*func) (void *info), void *info,

					 int wait)

{

	return smp_ops.smp_call_function_mask(mask, func, info, wait);

}

#endif



#ifdef CONFIG_X86_32

include/asm-x86/smp_32.h

+0 −6
Original line number Diff line number Diff line
@@ -60,12 +60,6 @@ static inline void smp_send_stop(void) 
{

	smp_ops.smp_send_stop();

}

static inline int smp_call_function_mask(cpumask_t mask,

					 void (*func) (void *info), void *info,

					 int wait)

{

	return smp_ops.smp_call_function_mask(mask, func, info, wait);

}



void native_smp_prepare_boot_cpu(void);

void native_smp_prepare_cpus(unsigned int max_cpus);