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

Commit bd6f56a7 authored by Al Viro's avatar Al Viro Committed by Geert Uytterhoeven
Browse files

m68k: Missing syscall_trace() on sigreturn 



If we leave sigreturn via ret_from_signal, we end up with syscall
trace only on entry, leading to very unhappy strace, among other
things.  Note that this means different behaviours for signals
delivered while we were in pagefault and for ones delivered while
we were in interrupt...

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent ea52b58c

arch/m68k/kernel/entry.S

+4 −1
Original line number Diff line number Diff line
@@ -99,7 +99,10 @@ do_trace_exit: 
	jra	.Lret_from_exception



ENTRY(ret_from_signal)

	RESTORE_SWITCH_STACK

	tstb	%curptr@(TASK_INFO+TINFO_FLAGS+2)

	jge	1f

	jbsr	syscall_trace

1:	RESTORE_SWITCH_STACK

	addql	#4,%sp

/* on 68040 complete pending writebacks if any */

#ifdef CONFIG_M68040