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 master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
cpu
/
sh3
/
entry.S
diff --git
a/arch/sh/kernel/cpu/sh3/entry.S
b/arch/sh/kernel/cpu/sh3/entry.S
index
7ba3dcb
..
8c0dc27
100644
(file)
--- a/
arch/sh/kernel/cpu/sh3/entry.S
+++ b/
arch/sh/kernel/cpu/sh3/entry.S
@@
-140,7
+140,7
@@
call_dpf:
mov.l 1f, r0
mov.l @r0, r6 ! address
mov.l 3f, r0
- sti
+
jmp @r0
mov r15, r4 ! regs