Skip to content

Commit

Permalink
m68k: use some direct calls to ret_from_exception in entry code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Ungerer committed Jul 15, 2012
1 parent 84a1caf commit 5bd9dd4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/m68k/kernel/entry_mm.S
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,15 @@ ENTRY(buserr)
movel %sp,%sp@- | stack frame pointer argument
bsrl buserr_c
addql #4,%sp
jra .Lret_from_exception
jra ret_from_exception

ENTRY(trap)
SAVE_ALL_INT
GET_CURRENT(%d0)
movel %sp,%sp@- | stack frame pointer argument
bsrl trap_c
addql #4,%sp
jra .Lret_from_exception
jra ret_from_exception

| After a fork we jump here directly from resume,
| so that %d1 contains the previous task
Expand All @@ -74,7 +74,7 @@ ENTRY(ret_from_fork)
movel %d1,%sp@-
jsr schedule_tail
addql #4,%sp
jra .Lret_from_exception
jra ret_from_exception

do_trace_entry:
movel #-ENOSYS,%sp@(PT_OFF_D0)| needed for strace
Expand Down

0 comments on commit 5bd9dd4

Please sign in to comment.