Prev: fix problems with NETIF_F_HIGHDMA in networking drivers
Next: drivers/net/myri10ge: Use pr_<level> and netdev_<level>
From: tip-bot for Wenji Huang on 26 Feb 2010 04:40 Commit-ID: 7b60997f73865b019e595720185c85285ca3df9a Gitweb: http://git.kernel.org/tip/7b60997f73865b019e595720185c85285ca3df9a Author: Wenji Huang <wenji.huang(a)oracle.com> AuthorDate: Wed, 24 Feb 2010 15:40:26 +0800 Committer: Steven Rostedt <rostedt(a)goodmis.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(a)cn.fujitsu.com> Signed-off-by: Wenji Huang <wenji.huang(a)oracle.com> LKML-Reference: <1266997226-6833-5-git-send-email-wenji.huang(a)oracle.com> Signed-off-by: Steven Rostedt <rostedt(a)goodmis.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(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |