---

yaml --- r: 147497 b: refs/heads/master c: e4cbb4e h: refs/heads/master i: 147495: 6ec8445 v: v3
git-mirror · May 25, 2009 · 79408a6 · 79408a6
1 parent 3d6c844
commit 79408a6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d94b943054721c346b0881865d645f000cd19880
+refs/heads/master: e4cbb4e3ac8b09fdb11e39e5a5611bfab0a7cd1a
diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
@@ -984,7 +984,6 @@ static struct task_struct *copy_process(unsigned long clone_flags,
 		goto fork_out;
 
 	rt_mutex_init_task(p);
-	perf_counter_init_task(p);
 
 #ifdef CONFIG_PROVE_LOCKING
 	DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
@@ -1096,6 +1095,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
 
 	/* Perform scheduler related setup. Assign this task to a CPU. */
 	sched_fork(p, clone_flags);
+	perf_counter_init_task(p);
 
 	if ((retval = audit_alloc(p)))
 		goto bad_fork_cleanup_policy;