From ab09a9832a050d02dc4bb20a5b0c20b84180b524 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Sun, 29 Nov 2009 16:34:48 +0200
Subject: [PATCH] --- yaml --- r: 172259 b: refs/heads/master c:
 8e7cac79808b62f242069a6ac88d364d35621371 h: refs/heads/master i:   172257:
 eb8c15464e208779ad15b6c544337e185d6bf44e   172255:
 be21e14a393e345ccfe3529af060f719e0fc0f31 v: v3

---
 [refs]                                     | 2 +-
 trunk/include/linux/user-return-notifier.h | 7 +++++++
 trunk/kernel/fork.c                        | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 614e85516039..b89c866b86e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c912b6edaac56cb451e7571c95c15cbb6bd0c81
+refs/heads/master: 8e7cac79808b62f242069a6ac88d364d35621371
diff --git a/trunk/include/linux/user-return-notifier.h b/trunk/include/linux/user-return-notifier.h
index b6ac056291d7..9c4a445bb43c 100644
--- a/trunk/include/linux/user-return-notifier.h
+++ b/trunk/include/linux/user-return-notifier.h
@@ -26,6 +26,11 @@ static inline void propagate_user_return_notify(struct task_struct *prev,
 
 void fire_user_return_notifiers(void);
 
+static inline void clear_user_return_notifier(struct task_struct *p)
+{
+	clear_tsk_thread_flag(p, TIF_USER_RETURN_NOTIFY);
+}
+
 #else
 
 struct user_return_notifier {};
@@ -37,6 +42,8 @@ static inline void propagate_user_return_notify(struct task_struct *prev,
 
 static inline void fire_user_return_notifiers(void) {}
 
+static inline void clear_user_return_notifier(struct task_struct *p) {}
+
 #endif
 
 #endif
diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
index 266c6af6ef1b..1b7512d5a64a 100644
--- a/trunk/kernel/fork.c
+++ b/trunk/kernel/fork.c
@@ -64,6 +64,7 @@
 #include <linux/magic.h>
 #include <linux/perf_event.h>
 #include <linux/posix-timers.h>
+#include <linux/user-return-notifier.h>
 
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
@@ -249,6 +250,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
 		goto out;
 
 	setup_thread_stack(tsk, orig);
+	clear_user_return_notifier(tsk);
 	stackend = end_of_stack(tsk);
 	*stackend = STACK_END_MAGIC;	/* for overflow detection */