From ea48cf3224bd016b7faa97eaa5c6570f4045b13d Mon Sep 17 00:00:00 2001
From: Paul Jackson <pj@sgi.com>
Date: Mon, 28 Nov 2005 13:44:05 -0800
Subject: [PATCH] --- yaml --- r: 14726 b: refs/heads/master c:
 8c4b8add83c93306b07d78469fd351dc462e4b66 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/kernel/fork.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a93d5f70afe8..0477af8889e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3148890bfa4f36c9949871264e06ef4d449eeff9
+refs/heads/master: 8c4b8add83c93306b07d78469fd351dc462e4b66
diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
index d0d49879ab7c..fb8572a42297 100644
--- a/trunk/kernel/fork.c
+++ b/trunk/kernel/fork.c
@@ -1124,8 +1124,6 @@ static task_t *copy_process(unsigned long clone_flags,
 	if (unlikely(p->ptrace & PT_PTRACED))
 		__ptrace_link(p, current->parent);
 
-	cpuset_fork(p);
-
 	attach_pid(p, PIDTYPE_PID, p->pid);
 	attach_pid(p, PIDTYPE_TGID, p->tgid);
 	if (thread_group_leader(p)) {
@@ -1142,6 +1140,7 @@ static task_t *copy_process(unsigned long clone_flags,
 	total_forks++;
 	write_unlock_irq(&tasklist_lock);
 	proc_fork_connector(p);
+	cpuset_fork(p);
 	retval = 0;
 
 fork_out: