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.org/pub/scm/linux/kernel/git/sage/ceph...
[pandora-kernel.git]
/
arch
/
m68k
/
include
/
asm
/
entry_no.h
diff --git
a/arch/m68k/include/asm/entry_no.h
b/arch/m68k/include/asm/entry_no.h
index
627d69b
..
68611e3
100644
(file)
--- a/
arch/m68k/include/asm/entry_no.h
+++ b/
arch/m68k/include/asm/entry_no.h
@@
-96,11
+96,11
@@
.endm
.macro RDUSP
.endm
.macro RDUSP
- movel sw_usp,%a
2
+ movel sw_usp,%a
3
.endm
.macro WRUSP
.endm
.macro WRUSP
- movel %a
0
,sw_usp
+ movel %a
3
,sw_usp
.endm
#else /* !CONFIG_COLDFIRE_SW_A7 */
.endm
#else /* !CONFIG_COLDFIRE_SW_A7 */
@@
-127,13
+127,13
@@
.endm
.macro RDUSP
.endm
.macro RDUSP
- /*move %usp,%a
2
*/
- .word 0x4e6
a
+ /*move %usp,%a
3
*/
+ .word 0x4e6
b
.endm
.macro WRUSP
.endm
.macro WRUSP
- /*move %a
0
,%usp*/
- .word 0x4e6
0
+ /*move %a
3
,%usp*/
+ .word 0x4e6
3
.endm
#endif /* !CONFIG_COLDFIRE_SW_A7 */
.endm
#endif /* !CONFIG_COLDFIRE_SW_A7 */