From bf219a62ed6af5f7670e3bd696feccea613b2b53 Mon Sep 17 00:00:00 2001
From: Matt Fleming <matt.fleming@intel.com>
Date: Wed, 21 Mar 2012 16:33:44 -0700
Subject: [PATCH] --- yaml --- r: 292610 b: refs/heads/master c:
 ff6d21e7aafe3cf4b20697f67e656caa4daef40b h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/xtensa/kernel/signal.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 32eb8c7d4209..10d999be707b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa47ac59020e91082386f65a01f3e8cc6116ef95
+refs/heads/master: ff6d21e7aafe3cf4b20697f67e656caa4daef40b
diff --git a/trunk/arch/xtensa/kernel/signal.c b/trunk/arch/xtensa/kernel/signal.c
index 4f53770c42ec..24655e31d8fb 100644
--- a/trunk/arch/xtensa/kernel/signal.c
+++ b/trunk/arch/xtensa/kernel/signal.c
@@ -536,9 +536,6 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)
 		/* Set up the stack frame */
 		setup_frame(signr, &ka, &info, oldset, regs);
 
-		if (ka.sa.sa_flags & SA_ONESHOT)
-			ka.sa.sa_handler = SIG_DFL;
-
 		spin_lock_irq(&current->sighand->siglock);
 		sigorsets(&current->blocked, &current->blocked, &ka.sa.sa_mask);
 		if (!(ka.sa.sa_flags & SA_NODEFER))