git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-upstream' of git://openrisc.net/jonas/linux
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
entry.S
diff --git
a/arch/sparc/kernel/entry.S
b/arch/sparc/kernel/entry.S
index
9fe08a1
..
f445e98
100644
(file)
--- a/
arch/sparc/kernel/entry.S
+++ b/
arch/sparc/kernel/entry.S
@@
-293,7
+293,7
@@
maybe_smp4m_msg:
WRITE_PAUSE
wr %l4, PSR_ET, %psr
WRITE_PAUSE
- s
l
l %o3, 28, %o2 ! shift for simpler checks below
+ s
r
l %o3, 28, %o2 ! shift for simpler checks below
maybe_smp4m_msg_check_single:
andcc %o2, 0x1, %g0
beq,a maybe_smp4m_msg_check_mask