Merge branch 'linus' into perfcounters/core-v2

[linux-drm-fsl-dcu.git] / kernel / fork.c

diff --git a/kernel/fork.c b/kernel/fork.c
index 660c2b8765bce0e112c26460fe037714b6ea3ac5..381d7f9b70fb7b32a6db8d5ec0ab34821fcd8d31 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -975,6 +975,7 @@ 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);