diff options
Diffstat (limited to 'kernel/fork.c')
-rw-r--r-- | kernel/fork.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index bfee931ee3fb..2cebfb23b0b8 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -61,7 +61,7 @@ | |||
61 | #include <linux/blkdev.h> | 61 | #include <linux/blkdev.h> |
62 | #include <linux/fs_struct.h> | 62 | #include <linux/fs_struct.h> |
63 | #include <linux/magic.h> | 63 | #include <linux/magic.h> |
64 | #include <linux/perf_counter.h> | 64 | #include <linux/perf_event.h> |
65 | 65 | ||
66 | #include <asm/pgtable.h> | 66 | #include <asm/pgtable.h> |
67 | #include <asm/pgalloc.h> | 67 | #include <asm/pgalloc.h> |
@@ -1078,7 +1078,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, | |||
1078 | /* Perform scheduler related setup. Assign this task to a CPU. */ | 1078 | /* Perform scheduler related setup. Assign this task to a CPU. */ |
1079 | sched_fork(p, clone_flags); | 1079 | sched_fork(p, clone_flags); |
1080 | 1080 | ||
1081 | retval = perf_counter_init_task(p); | 1081 | retval = perf_event_init_task(p); |
1082 | if (retval) | 1082 | if (retval) |
1083 | goto bad_fork_cleanup_policy; | 1083 | goto bad_fork_cleanup_policy; |
1084 | 1084 | ||
@@ -1253,7 +1253,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, | |||
1253 | write_unlock_irq(&tasklist_lock); | 1253 | write_unlock_irq(&tasklist_lock); |
1254 | proc_fork_connector(p); | 1254 | proc_fork_connector(p); |
1255 | cgroup_post_fork(p); | 1255 | cgroup_post_fork(p); |
1256 | perf_counter_fork(p); | 1256 | perf_event_fork(p); |
1257 | return p; | 1257 | return p; |
1258 | 1258 | ||
1259 | bad_fork_free_pid: | 1259 | bad_fork_free_pid: |
@@ -1280,7 +1280,7 @@ bad_fork_cleanup_semundo: | |||
1280 | bad_fork_cleanup_audit: | 1280 | bad_fork_cleanup_audit: |
1281 | audit_free(p); | 1281 | audit_free(p); |
1282 | bad_fork_cleanup_policy: | 1282 | bad_fork_cleanup_policy: |
1283 | perf_counter_free_task(p); | 1283 | perf_event_free_task(p); |
1284 | #ifdef CONFIG_NUMA | 1284 | #ifdef CONFIG_NUMA |
1285 | mpol_put(p->mempolicy); | 1285 | mpol_put(p->mempolicy); |
1286 | bad_fork_cleanup_cgroup: | 1286 | bad_fork_cleanup_cgroup: |