---

yaml --- r: 211051 b: refs/heads/master c: b2b163b h: refs/heads/master i: 211049: 2dc7e63 211047: e008c17 v: v3
git-mirror · Sep 17, 2010 · d3bdff2 · d3bdff2
1 parent 46967c2
commit d3bdff2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a8e41cd672f894bbd74874eac601e6cedf838fb
+refs/heads/master: b2b163bb82b12bae2504a5b31399c37d099ad3cc
diff --git a/trunk/arch/arm/kernel/entry-common.S b/trunk/arch/arm/kernel/entry-common.S
@@ -48,6 +48,8 @@ work_pending:
 	beq	no_work_pending
 	mov	r0, sp				@ 'regs'
 	mov	r2, why				@ 'syscall'
+	tst	r1, #_TIF_SIGPENDING		@ delivering a signal?
+	movne	why, #0				@ prevent further restarts
 	bl	do_notify_resume
 	b	ret_slow_syscall		@ Check work again