From d3bdff281a2ca8d3fb1719739be3e5d339712e2f Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 17 Sep 2010 14:56:16 +0100
Subject: [PATCH] --- yaml --- r: 211051 b: refs/heads/master c:
 b2b163bb82b12bae2504a5b31399c37d099ad3cc h: refs/heads/master i:   211049:
 2dc7e63f26513e17d41ebb3dbc0a315e7ce2db1c   211047:
 e008c17f8e7afb260bff529ae85872551f2d8e17 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/kernel/entry-common.S | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 12c88f3fb748..c609db3b85be 100644
--- 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
index f05a35a59694..4a560d30793d 100644
--- 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