diff options
| author | Daniel Hellstrom <daniel@gaisler.com> | 2011-06-09 02:54:08 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-09 16:12:34 -0700 |
| commit | a7d82a0a3cd547494294baee7f9764ea44bead73 (patch) | |
| tree | 4d777ad78a98fbb0d432e07e2f5d1b3d61af5b8b /arch/sparc/kernel | |
| parent | 6cb79b3f3ba2b14590cac02ee13ab7410b6225ed (diff) | |
| download | blackbird-op-linux-a7d82a0a3cd547494294baee7f9764ea44bead73.tar.gz blackbird-op-linux-a7d82a0a3cd547494294baee7f9764ea44bead73.zip | |
sparc32, sun4m: bugfix in SMP IPI traphandler
Three new IPIs were introduced by commit
ecbc42b70acbc6327adefe9635db93fcf62bf59d ("sparc32, sun4m:
Implemented SMP IPIs support for SUN4M machines"), the
old handler was already prepared for IPIs but handled only
IRQ14 and IRQ13, this patch adds support for the new IPI at
IRQ12.
The IPI trap handler looks at the mask rather than the
pending IRQ/IPI, this bug may have masked the problem
above, introduced by the same commit.
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel')
| -rw-r--r-- | arch/sparc/kernel/entry.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S index c4e616711348..9fe08a1ea6c6 100644 --- a/arch/sparc/kernel/entry.S +++ b/arch/sparc/kernel/entry.S @@ -229,7 +229,7 @@ real_irq_entry: #ifdef CONFIG_SMP .globl patchme_maybe_smp_msg - cmp %l7, 12 + cmp %l7, 11 patchme_maybe_smp_msg: bgu maybe_smp4m_msg nop @@ -293,7 +293,7 @@ maybe_smp4m_msg: WRITE_PAUSE wr %l4, PSR_ET, %psr WRITE_PAUSE - sll %o2, 28, %o2 ! shift for simpler checks below + sll %o3, 28, %o2 ! shift for simpler checks below maybe_smp4m_msg_check_single: andcc %o2, 0x1, %g0 beq,a maybe_smp4m_msg_check_mask |
