Commit 8678969e authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar

x86: merge smp_send_reschedule

function definition is moved to common header, x86_64 version is now called
native_smp_send_reschedule
Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c76cb368
...@@ -290,8 +290,9 @@ void flush_tlb_all(void) ...@@ -290,8 +290,9 @@ void flush_tlb_all(void)
* anything. Worst case is that we lose a reschedule ... * anything. Worst case is that we lose a reschedule ...
*/ */
void smp_send_reschedule(int cpu) static void native_smp_send_reschedule(int cpu)
{ {
WARN_ON(cpu_is_offline(cpu));
send_IPI_mask(cpumask_of_cpu(cpu), RESCHEDULE_VECTOR); send_IPI_mask(cpumask_of_cpu(cpu), RESCHEDULE_VECTOR);
} }
...@@ -528,5 +529,7 @@ asmlinkage void smp_call_function_interrupt(void) ...@@ -528,5 +529,7 @@ asmlinkage void smp_call_function_interrupt(void)
} }
} }
struct smp_ops smp_ops; struct smp_ops smp_ops = {
.smp_send_reschedule = native_smp_send_reschedule,
};
EXPORT_SYMBOL_GPL(smp_ops); EXPORT_SYMBOL_GPL(smp_ops);
...@@ -23,6 +23,11 @@ struct smp_ops { ...@@ -23,6 +23,11 @@ struct smp_ops {
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
extern struct smp_ops smp_ops; extern struct smp_ops smp_ops;
static inline void smp_send_reschedule(int cpu)
{
smp_ops.smp_send_reschedule(cpu);
}
#endif #endif
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
......
...@@ -60,10 +60,6 @@ static inline void smp_send_stop(void) ...@@ -60,10 +60,6 @@ static inline void smp_send_stop(void)
{ {
smp_ops.smp_send_stop(); smp_ops.smp_send_stop();
} }
static inline void smp_send_reschedule(int cpu)
{
smp_ops.smp_send_reschedule(cpu);
}
static inline int smp_call_function_mask(cpumask_t mask, static inline int smp_call_function_mask(cpumask_t mask,
void (*func) (void *info), void *info, void (*func) (void *info), void *info,
int wait) int wait)
......
...@@ -65,8 +65,6 @@ static inline int num_booting_cpus(void) ...@@ -65,8 +65,6 @@ static inline int num_booting_cpus(void)
return cpus_weight(cpu_callout_map); return cpus_weight(cpu_callout_map);
} }
extern void smp_send_reschedule(int cpu);
#else /* CONFIG_SMP */ #else /* CONFIG_SMP */
extern unsigned int boot_cpu_id; extern unsigned int boot_cpu_id;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment