Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b15d055 authored by Li Zefan's avatar Li Zefan Committed by Ingo Molnar
Browse files

perf cgroup: Clean up perf_cgroup_create() 



- Use kzalloc() to replace kmalloc() + memset().

- Remove redundant initialization, since alloc_percpu() returns
  zero-filled percpu memory.

Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
Acked-by: default avatarStephane Eranian <eranian@google.com>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <4D6F347E.2010806@cn.fujitsu.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f75e18cb

kernel/perf_event.c

+1 −10
Original line number Diff line number Diff line
@@ -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;

}