Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bd9dd45 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

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: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 84a1caf1

arch/m68k/kernel/entry_mm.S

+3 −3
Original line number Diff line number Diff line
@@ -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