diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2012-05-09 16:03:06 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2012-07-16 09:59:20 +1000 |
| commit | 5bd9dd450173bc1464e8218e717d218075b9f1a4 (patch) | |
| tree | 83e06d904ae9897dc419e88394e6b1ac75f2213a | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
| download | op-kernel-dev-5bd9dd450173bc1464e8218e717d218075b9f1a4.zip op-kernel-dev-5bd9dd450173bc1464e8218e717d218075b9f1a4.tar.gz | |
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>
| -rw-r--r-- | arch/m68k/kernel/entry_mm.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/kernel/entry_mm.S b/arch/m68k/kernel/entry_mm.S index f29e73c..ff75368 100644 --- a/arch/m68k/kernel/entry_mm.S +++ b/arch/m68k/kernel/entry_mm.S @@ -57,7 +57,7 @@ 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 @@ -65,7 +65,7 @@ ENTRY(trap) 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 @@ -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 |
