Skip to content

Commit

Permalink
m68k: Missing syscall_trace() on sigreturn
Browse files Browse the repository at this point in the history
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: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
  • Loading branch information
Al Viro authored and Geert Uytterhoeven committed Jan 7, 2011
1 parent ea52b58 commit bd6f56a
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion arch/m68k/kernel/entry.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit bd6f56a

Please sign in to comment.