aboutsummaryrefslogtreecommitdiff
path: root/kernel/fork.c
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-12-03 09:30:06 +0200
committerAvi Kivity <avi@redhat.com>2009-12-03 09:30:06 +0200
commit58988b07cfe2ebe9f9b39d973fd8a083390e749f (patch)
treef7a164abe85b8aa768c58a80c1261208372fb4b0 /kernel/fork.c
parent22763c5cf3690a681551162c15d34d935308c8d7 (diff)
parent8e7cac79808b62f242069a6ac88d364d35621371 (diff)
Merge remote branch 'tip/x86/entry' into kvm-updates/2.6.33
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'kernel/fork.c')
-rw-r--r--kernel/fork.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/fork.c b/kernel/fork.c
index 166b8c49257..7d4a348ea4f 100644
--- a/kernel/fork.c
+++ b/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 */