[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-7b60997f73865b019e595720185c85285ca3df9a@git.kernel.org>
Date: Fri, 26 Feb 2010 09:29:07 GMT
From: tip-bot for Wenji Huang <wenji.huang@...cle.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
rostedt@...dmis.org, lizf@...fujitsu.com, wenji.huang@...cle.com,
tglx@...utronix.de
Subject: [tip:tracing/core] tracing: Simplify memory recycle of trace_define_field
Commit-ID: 7b60997f73865b019e595720185c85285ca3df9a
Gitweb: http://git.kernel.org/tip/7b60997f73865b019e595720185c85285ca3df9a
Author: Wenji Huang <wenji.huang@...cle.com>
AuthorDate: Wed, 24 Feb 2010 15:40:26 +0800
Committer: Steven Rostedt <rostedt@...dmis.org>
CommitDate: Thu, 25 Feb 2010 10:42:55 -0500
tracing: Simplify memory recycle of trace_define_field
Discard freeing field->type since it is not necessary.
Reviewed-by: Li Zefan <lizf@...fujitsu.com>
Signed-off-by: Wenji Huang <wenji.huang@...cle.com>
LKML-Reference: <1266997226-6833-5-git-send-email-wenji.huang@...cle.com>
Signed-off-by: Steven Rostedt <rostedt@...dmis.org>
---
kernel/trace/trace_events.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index c2a3077..3f972ad 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -60,10 +60,8 @@ int trace_define_field(struct ftrace_event_call *call, const char *type,
return 0;
err:
- if (field) {
+ if (field)
kfree(field->name);
- kfree(field->type);
- }
kfree(field);
return -ENOMEM;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists