From 1b2afdd843b0104df01ccb91a41d7e0303079671 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 20 Feb 2011 12:22:52 +0000
Subject: [PATCH] --- yaml --- r: 233490 b: refs/heads/master c:
 53399053eb505cf541b2405bd9d9bca5ecfb96fb h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/arm/kernel/signal.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ddec897c2ff1..819868a56267 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc810efb0ca5702c9d96782b99282d4b4383e877
+refs/heads/master: 53399053eb505cf541b2405bd9d9bca5ecfb96fb
diff --git a/trunk/arch/arm/kernel/signal.c b/trunk/arch/arm/kernel/signal.c
index 907d5a620bca..abaf8445ce25 100644
--- a/trunk/arch/arm/kernel/signal.c
+++ b/trunk/arch/arm/kernel/signal.c
@@ -474,7 +474,9 @@ setup_return(struct pt_regs *regs, struct k_sigaction *ka,
 	unsigned long handler = (unsigned long)ka->sa.sa_handler;
 	unsigned long retcode;
 	int thumb = 0;
-	unsigned long cpsr = regs->ARM_cpsr & ~PSR_f;
+	unsigned long cpsr = regs->ARM_cpsr & ~(PSR_f | PSR_E_BIT);
+
+	cpsr |= PSR_ENDSTATE;
 
 	/*
 	 * Maybe we need to deliver a 32-bit signal to a 26-bit task.