From: Greg Ungerer Date: Wed, 9 May 2012 06:03:06 +0000 (+1000) Subject: m68k: use some direct calls to ret_from_exception in entry code X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5bd9dd450173bc1464e8218e717d218075b9f1a4;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Acked-by: Geert Uytterhoeven --- 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) 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