From 21d4968c769d512e9cf942934df38fcfb3104656 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Thu, 3 Mar 2011 14:26:06 +0800
Subject: [PATCH] --- yaml --- r: 234500 b: refs/heads/master c:
 1b15d0558e82df9b3659804ceb44187b98eda354 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/kernel/perf_event.c | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index b1bb5c4fd85d..73d5b77a9860 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f75e18cb9627b1d3d752b83a0b5563da0042c50a
+refs/heads/master: 1b15d0558e82df9b3659804ceb44187b98eda354
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index b00209544d57..193b1900e64f 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/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;
 }