From 7a325329adf2d66156ef37814a39eaab90514a71 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 15 Jul 2012 14:10:52 +0400
Subject: [PATCH] --- yaml --- r: 312943 b: refs/heads/master c:
 7266702805f9d824f92ce5c4069eca65d0f21d28 h: refs/heads/master i:   312941:
 078e584a33706d9c67fa1bd7860fe7b5d16d4057   312939:
 59617f6fe70b3040b7633db22bf1d63361d072cb   312935:
 399df603db5fe7dd5c408ec7b492b6792a3c63a3   312927:
 be4daecf66adf44f03e26ea8067d5986e2085ec8 v: v3

---
 [refs]                |  2 +-
 trunk/kernel/signal.c | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9eb7bc745fe4..5bba65614ced 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e0ea0014479f066ba26f937e8740b8902229616
+refs/heads/master: 7266702805f9d824f92ce5c4069eca65d0f21d28
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
index 677102789cf2..be4f856d52f8 100644
--- a/trunk/kernel/signal.c
+++ b/trunk/kernel/signal.c
@@ -1971,6 +1971,13 @@ static void ptrace_do_notify(int signr, int exit_code, int why)
 void ptrace_notify(int exit_code)
 {
 	BUG_ON((exit_code & (0x7f | ~0xffff)) != SIGTRAP);
+	if (unlikely(current->task_works)) {
+		if (test_and_clear_ti_thread_flag(current_thread_info(),
+						   TIF_NOTIFY_RESUME)) {
+			smp_mb__after_clear_bit();
+			task_work_run();
+		}
+	}
 
 	spin_lock_irq(&current->sighand->siglock);
 	ptrace_do_notify(SIGTRAP, exit_code, CLD_TRAPPED);
@@ -2191,6 +2198,14 @@ int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka,
 	struct signal_struct *signal = current->signal;
 	int signr;
 
+	if (unlikely(current->task_works)) {
+		if (test_and_clear_ti_thread_flag(current_thread_info(),
+						   TIF_NOTIFY_RESUME)) {
+			smp_mb__after_clear_bit();
+			task_work_run();
+		}
+	}
+
 	if (unlikely(uprobe_deny_signal()))
 		return 0;