From 99ed20354fb10089e0b830949950d4f2e65a5b9c Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Fri, 14 Sep 2012 19:05:46 +0200
Subject: [PATCH] --- yaml --- r: 334755 b: refs/heads/master c:
 db023ea595015058270be6a62fe60a7b6b5c50d7 h: refs/heads/master i:   334753:
 ec41e34b85f74f68ee46d4bfac74dca52c5ad4b7   334751:
 2ffe32ed2feff79baf5715b6dc262be725f55dce v: v3

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

diff --git a/[refs] b/[refs]
index 1bd8796f7583..debe29a94065 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b08e907211cdc744f54871736005d9f3e7f182c
+refs/heads/master: db023ea595015058270be6a62fe60a7b6b5c50d7
diff --git a/trunk/arch/x86/kernel/signal.c b/trunk/arch/x86/kernel/signal.c
index b280908a376e..0041e5a5293b 100644
--- a/trunk/arch/x86/kernel/signal.c
+++ b/trunk/arch/x86/kernel/signal.c
@@ -785,10 +785,8 @@ do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags)
 		mce_notify_process();
 #endif /* CONFIG_X86_64 && CONFIG_X86_MCE */
 
-	if (thread_info_flags & _TIF_UPROBE) {
-		clear_thread_flag(TIF_UPROBE);
+	if (thread_info_flags & _TIF_UPROBE)
 		uprobe_notify_resume(regs);
-	}
 
 	/* deal with pending signal delivery */
 	if (thread_info_flags & _TIF_SIGPENDING)
diff --git a/trunk/kernel/events/uprobes.c b/trunk/kernel/events/uprobes.c
index d3f5381e7482..198d732ab901 100644
--- a/trunk/kernel/events/uprobes.c
+++ b/trunk/kernel/events/uprobes.c
@@ -1558,6 +1558,8 @@ void uprobe_notify_resume(struct pt_regs *regs)
 {
 	struct uprobe_task *utask;
 
+	clear_thread_flag(TIF_UPROBE);
+
 	utask = current->utask;
 	if (utask && utask->active_uprobe)
 		handle_singlestep(utask, regs);