From f07f4bd03dd7f57e0250715150d69dd7133203e4 Mon Sep 17 00:00:00 2001
From: Li Zhong <zhong@linux.vnet.ibm.com>
Date: Mon, 13 May 2013 16:16:42 +0000
Subject: [PATCH] --- yaml --- r: 375569 b: refs/heads/master c:
 106ed886abc46723c290e82e5f161d9b40820203 h: refs/heads/master i:   375567:
 a18e51633acd5892b8db7d35b6e39dbd99b89acc v: v3

---
 [refs]                             | 2 +-
 trunk/arch/powerpc/kernel/signal.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 45439c25c5d5..651778264380 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba12eedee321eeb5baecaada285daeb3462c35f5
+refs/heads/master: 106ed886abc46723c290e82e5f161d9b40820203
diff --git a/trunk/arch/powerpc/kernel/signal.c b/trunk/arch/powerpc/kernel/signal.c
index cf12eae02de5..d63b5024c563 100644
--- a/trunk/arch/powerpc/kernel/signal.c
+++ b/trunk/arch/powerpc/kernel/signal.c
@@ -13,6 +13,7 @@
 #include <linux/signal.h>
 #include <linux/uprobes.h>
 #include <linux/key.h>
+#include <linux/context_tracking.h>
 #include <asm/hw_breakpoint.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
@@ -159,6 +160,8 @@ static int do_signal(struct pt_regs *regs)
 
 void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags)
 {
+	user_exit();
+
 	if (thread_info_flags & _TIF_UPROBE)
 		uprobe_notify_resume(regs);
 
@@ -169,4 +172,6 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags)
 		clear_thread_flag(TIF_NOTIFY_RESUME);
 		tracehook_notify_resume(regs);
 	}
+
+	user_enter();
 }