diff options
Diffstat (limited to 'kernel/perf_event.c')
-rw-r--r-- | kernel/perf_event.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index b00209544d57..193b1900e64f 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c | |||
@@ -7346,26 +7346,17 @@ static struct cgroup_subsys_state *perf_cgroup_create( | |||
7346 | struct cgroup_subsys *ss, struct cgroup *cont) | 7346 | struct cgroup_subsys *ss, struct cgroup *cont) |
7347 | { | 7347 | { |
7348 | struct perf_cgroup *jc; | 7348 | struct perf_cgroup *jc; |
7349 | struct perf_cgroup_info *t; | ||
7350 | int c; | ||
7351 | 7349 | ||
7352 | jc = kmalloc(sizeof(*jc), GFP_KERNEL); | 7350 | jc = kzalloc(sizeof(*jc), GFP_KERNEL); |
7353 | if (!jc) | 7351 | if (!jc) |
7354 | return ERR_PTR(-ENOMEM); | 7352 | return ERR_PTR(-ENOMEM); |
7355 | 7353 | ||
7356 | memset(jc, 0, sizeof(*jc)); | ||
7357 | |||
7358 | jc->info = alloc_percpu(struct perf_cgroup_info); | 7354 | jc->info = alloc_percpu(struct perf_cgroup_info); |
7359 | if (!jc->info) { | 7355 | if (!jc->info) { |
7360 | kfree(jc); | 7356 | kfree(jc); |
7361 | return ERR_PTR(-ENOMEM); | 7357 | return ERR_PTR(-ENOMEM); |
7362 | } | 7358 | } |
7363 | 7359 | ||
7364 | for_each_possible_cpu(c) { | ||
7365 | t = per_cpu_ptr(jc->info, c); | ||
7366 | t->time = 0; | ||
7367 | t->timestamp = 0; | ||
7368 | } | ||
7369 | return &jc->css; | 7360 | return &jc->css; |
7370 | } | 7361 | } |
7371 | 7362 | ||