diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-20 22:10:22 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-20 22:10:22 +0200 |
| commit | 90d3ac15e5c637d45849e83c828ed78c62886737 (patch) | |
| tree | c5568365f32386559d2710e8981ed41e5fe0eb12 /arch/sparc/kernel/smp_64.c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sp... (diff) | |
| parent | sched: Move the second half of ttwu() to the remote cpu (diff) | |
| download | linux-90d3ac15e5c637d45849e83c828ed78c62886737.tar.xz linux-90d3ac15e5c637d45849e83c828ed78c62886737.zip | |
Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8'
Conflicts:
arch/sparc/kernel/smp_32.c
With merge conflict help from Daniel Hellstrom.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/smp_64.c')
| -rw-r--r-- | arch/sparc/kernel/smp_64.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c index c274a30c3cbf..99cb17251bb5 100644 --- a/arch/sparc/kernel/smp_64.c +++ b/arch/sparc/kernel/smp_64.c @@ -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 |