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-linus' of git://git.kernel.dk/linux-block
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
entry.S
diff --git
a/arch/sparc/kernel/entry.S
b/arch/sparc/kernel/entry.S
index
8341963
..
9fe08a1
100644
(file)
--- 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
#ifdef CONFIG_SMP
.globl patchme_maybe_smp_msg
- cmp %l7, 1
2
+ cmp %l7, 1
1
patchme_maybe_smp_msg:
bgu maybe_smp4m_msg
nop
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
WRITE_PAUSE
wr %l4, PSR_ET, %psr
WRITE_PAUSE
- sll %o
2
, 28, %o2 ! shift for simpler checks below
+ sll %o
3
, 28, %o2 ! shift for simpler checks below
maybe_smp4m_msg_check_single:
andcc %o2, 0x1, %g0
beq,a maybe_smp4m_msg_check_mask
maybe_smp4m_msg_check_single:
andcc %o2, 0x1, %g0
beq,a maybe_smp4m_msg_check_mask
@@
-1604,7
+1604,7
@@
restore_current:
retl
nop
retl
nop
-#ifdef CONFIG_PCI
+#ifdef CONFIG_PCI
C_PCI
#include <asm/pcic.h>
.align 4
#include <asm/pcic.h>
.align 4
@@
-1650,7
+1650,7
@@
pcic_nmi_trap_patch:
rd %psr, %l0
.word 0
rd %psr, %l0
.word 0
-#endif /* CONFIG_PCI */
+#endif /* CONFIG_PCI
C_PCI
*/
.globl flushw_all
flushw_all:
.globl flushw_all
flushw_all: