aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/kernel
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2012-05-09 02:03:06 -0400
committerGreg Ungerer <gerg@uclinux.org>2012-07-15 19:59:20 -0400
commit5bd9dd450173bc1464e8218e717d218075b9f1a4 (patch)
tree83e06d904ae9897dc419e88394e6b1ac75f2213a /arch/m68k/kernel
parent84a1caf1453c3d44050bd22db958af4a7f99315c (diff)
m68k: use some direct calls to ret_from_exception in entry code
The ret_from_excption code is referenced by its function name, or by a label set at the start of its code. The non-MMU code can share some of this code if we make direct calls to ret_from_exception instead of the associated label. The effected function paths are: buserr, trap and ret_from_fork. So change these to branch directly to ret_from_exception. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/kernel')
-rw-r--r--arch/m68k/kernel/entry_mm.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/kernel/entry_mm.S b/arch/m68k/kernel/entry_mm.S
index f29e73ca9dbb..ff75368b18ee 100644
--- a/arch/m68k/kernel/entry_mm.S
+++ b/arch/m68k/kernel/entry_mm.S
@@ -57,7 +57,7 @@ ENTRY(buserr)
57 movel %sp,%sp@- | stack frame pointer argument 57 movel %sp,%sp@- | stack frame pointer argument
58 bsrl buserr_c 58 bsrl buserr_c
59 addql #4,%sp 59 addql #4,%sp
60 jra .Lret_from_exception 60 jra ret_from_exception
61 61
62ENTRY(trap) 62ENTRY(trap)
63 SAVE_ALL_INT 63 SAVE_ALL_INT
@@ -65,7 +65,7 @@ ENTRY(trap)
65 movel %sp,%sp@- | stack frame pointer argument 65 movel %sp,%sp@- | stack frame pointer argument
66 bsrl trap_c 66 bsrl trap_c
67 addql #4,%sp 67 addql #4,%sp
68 jra .Lret_from_exception 68 jra ret_from_exception
69 69
70 | After a fork we jump here directly from resume, 70 | After a fork we jump here directly from resume,
71 | so that %d1 contains the previous task 71 | so that %d1 contains the previous task
@@ -74,7 +74,7 @@ ENTRY(ret_from_fork)
74 movel %d1,%sp@- 74 movel %d1,%sp@-
75 jsr schedule_tail 75 jsr schedule_tail
76 addql #4,%sp 76 addql #4,%sp
77 jra .Lret_from_exception 77 jra ret_from_exception
78 78
79do_trace_entry: 79do_trace_entry:
80 movel #-ENOSYS,%sp@(PT_OFF_D0)| needed for strace 80 movel #-ENOSYS,%sp@(PT_OFF_D0)| needed for strace