---

yaml --- r: 339515 b: refs/heads/master c: ad75b51 h: refs/heads/master i: 339513: c42501b 339511: 41e71b7 v: v3
git-mirror · Nov 19, 2012 · 6f0bded · 6f0bded
1 parent 7f6ceca
commit 6f0bded
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: 9b790d71d58be65f9508ab60920eb978af828412
+refs/heads/master: ad75b51459ae076a0d406391496f81b897bf6992
diff --git a/trunk/arch/arm/kernel/entry-common.S b/trunk/arch/arm/kernel/entry-common.S
@@ -448,7 +448,10 @@ __sys_trace:
 	ldmccia	r1, {r0 - r6}			@ have to reload r0 - r6
 	stmccia	sp, {r4, r5}			@ and update the stack args
 	ldrcc	pc, [tbl, scno, lsl #2]		@ call sys_* routine
-	b	2b
+	cmp	scno, #-1			@ skip the syscall?
+	bne	2b
+	add	sp, sp, #S_OFF			@ restore stack
+	b	ret_slow_syscall
 
 __sys_trace_return:
 	str	r0, [sp, #S_R0 + S_OFF]!	@ save returned r0