From: tip-bot for Li Zefan <lizf@cn.fujitsu.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, eranian@google.com, hpa@zytor.com,
mingo@redhat.com, a.p.zijlstra@chello.nl, lizf@cn.fujitsu.com,
tglx@linutronix.de, mingo@elte.hu
Subject: [tip:perf/core] perf cgroup: Clean up perf_cgroup_create()
Date: Fri, 4 Mar 2011 11:51:43 GMT [thread overview]
Message-ID: <tip-1b15d0558e82df9b3659804ceb44187b98eda354@git.kernel.org> (raw)
In-Reply-To: <4D6F347E.2010806@cn.fujitsu.com>
Commit-ID: 1b15d0558e82df9b3659804ceb44187b98eda354
Gitweb: http://git.kernel.org/tip/1b15d0558e82df9b3659804ceb44187b98eda354
Author: Li Zefan <lizf@cn.fujitsu.com>
AuthorDate: Thu, 3 Mar 2011 14:26:06 +0800
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Fri, 4 Mar 2011 11:32:51 +0100
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: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Stephane Eranian <eranian@google.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <4D6F347E.2010806@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
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 b002095..193b190 100644
--- 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;
}
next prev parent reply other threads:[~2011-03-04 11:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-03 6:25 [PATCH 1/4] perf cgroup: Fix leak of file reference count Li Zefan
2011-03-03 6:25 ` [PATCH 2/4] perf cgroup: Fix unmatched call to perf_detach_cgroup() Li Zefan
2011-03-03 7:41 ` Stephane Eranian
2011-03-04 11:51 ` [tip:perf/core] " tip-bot for Li Zefan
2011-03-03 6:26 ` [PATCH 3/4] perf cgroup: Clean up perf_cgroup_create() Li Zefan
2011-03-03 7:42 ` Stephane Eranian
2011-03-03 8:37 ` Stephane Eranian
2011-03-03 8:40 ` Stephane Eranian
2011-03-04 11:51 ` tip-bot for Li Zefan [this message]
2011-03-03 6:26 ` [PATCH 4/4] perf cgroup: Fix a typo in kernel config Li Zefan
2011-03-04 11:52 ` [tip:perf/core] " tip-bot for Li Zefan
2011-03-03 7:40 ` [PATCH 1/4] perf cgroup: Fix leak of file reference count Stephane Eranian
2011-03-03 10:35 ` Peter Zijlstra
2011-03-04 11:50 ` [tip:perf/core] " tip-bot for Li Zefan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-1b15d0558e82df9b3659804ceb44187b98eda354@git.kernel.org \
--to=lizf@cn.fujitsu.com \
--cc=a.p.zijlstra@chello.nl \
--cc=eranian@google.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome