---

yaml --- r: 227842 b: refs/heads/master c: bd6f56a h: refs/heads/master v: v3
git-mirror · Jan 7, 2011 · 989ec45 · 989ec45
1 parent 9b90084
commit 989ec45
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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