From 989ec4589c51218306d13b0007d9adc0ccb99bce Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 11 Oct 2010 23:13:51 -0400 Subject: [PATCH] --- yaml --- r: 227842 b: refs/heads/master c: bd6f56a75bb2a65b3a1b8d14a9787fdaadae71c1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/m68k/kernel/entry.S | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 30bb47a340c0..6bfd2e99172e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea52b58ccbda49aeb23eb424ce05bba3cb0bc976 +refs/heads/master: bd6f56a75bb2a65b3a1b8d14a9787fdaadae71c1 diff --git a/trunk/arch/m68k/kernel/entry.S b/trunk/arch/m68k/kernel/entry.S index 4e49f5777696..1559dea36e55 100644 --- a/trunk/arch/m68k/kernel/entry.S +++ b/trunk/arch/m68k/kernel/entry.S @@ -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