Merge branch 'sched/locking' into sched/core
Merge reason: the rq locking changes are stable, propagate them into the .40 queue. Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
@@ -125,7 +125,9 @@ struct linux_prom_registers smp_penguin_ctable __cpuinitdata = { 0 };
|
||||
|
||||
void smp_send_reschedule(int cpu)
|
||||
{
|
||||
/* See sparc64 */
|
||||
/*
|
||||
* XXX missing reschedule IPI, see scheduler_ipi()
|
||||
*/
|
||||
}
|
||||
|
||||
void smp_send_stop(void)
|
||||
|
@@ -1368,6 +1368,7 @@ void smp_send_reschedule(int cpu)
|
||||
void __irq_entry smp_receive_signal_client(int irq, struct pt_regs *regs)
|
||||
{
|
||||
clear_softint(1 << irq);
|
||||
scheduler_ipi();
|
||||
}
|
||||
|
||||
/* This is a nop because we capture all other cpus
|
||||
|
Reference in New Issue
Block a user