perf cgroup: Clean up perf_cgroup_create()

[pandora-kernel.git] / kernel / perf_event.c

diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index b002095..193b190 100644 (file)
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -7346,26 +7346,17 @@ static struct cgroup_subsys_state *perf_cgroup_create(
        struct cgroup_subsys *ss, struct cgroup *cont)
 {
        struct perf_cgroup *jc;
-       struct perf_cgroup_info *t;
-       int c;
 
-       jc = kmalloc(sizeof(*jc), GFP_KERNEL);
+       jc = kzalloc(sizeof(*jc), GFP_KERNEL);
        if (!jc)
                return ERR_PTR(-ENOMEM);
 
-       memset(jc, 0, sizeof(*jc));
-
        jc->info = alloc_percpu(struct perf_cgroup_info);
        if (!jc->info) {
                kfree(jc);
                return ERR_PTR(-ENOMEM);
        }
 
-       for_each_possible_cpu(c) {
-               t = per_cpu_ptr(jc->info, c);
-               t->time = 0;
-               t->timestamp = 0;
-       }
        return &jc->css;
 }