summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Ungerer2012-05-09 08:59:46 +0200
committerGreg Ungerer2012-07-16 01:59:20 +0200
commit28d5445e94ab22198921b5c0c3e58c3b4a1a0116 (patch)
treea7656122c3ab7fd4bf90553a20b1aa8125de14ca
parentm68k: use some direct calls to ret_from_exception in entry code (diff)
downloadkernel-qcow2-linux-28d5445e94ab22198921b5c0c3e58c3b4a1a0116.tar.gz
kernel-qcow2-linux-28d5445e94ab22198921b5c0c3e58c3b4a1a0116.tar.xz
kernel-qcow2-linux-28d5445e94ab22198921b5c0c3e58c3b4a1a0116.zip
m68k: use jbsr to call functions instead of bsrl
There is a few places that the m68k entry code uses the bsrl instruction to call other functions. That instruction is only supported on 68020 and higher CPU types. If we use jbsr instead the code will be clean for all 68k and ColdFire CPU types. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
-rw-r--r--arch/m68k/kernel/entry_mm.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/kernel/entry_mm.S b/arch/m68k/kernel/entry_mm.S
index ff75368b18ee..1055a6e40e41 100644
--- a/arch/m68k/kernel/entry_mm.S
+++ b/arch/m68k/kernel/entry_mm.S
@@ -55,7 +55,7 @@ ENTRY(buserr)
SAVE_ALL_INT
GET_CURRENT(%d0)
movel %sp,%sp@- | stack frame pointer argument
- bsrl buserr_c
+ jbsr buserr_c
addql #4,%sp
jra ret_from_exception
@@ -63,7 +63,7 @@ ENTRY(trap)
SAVE_ALL_INT
GET_CURRENT(%d0)
movel %sp,%sp@- | stack frame pointer argument
- bsrl trap_c
+ jbsr trap_c
addql #4,%sp
jra ret_from_exception