From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752934AbZL2Q0o (ORCPT ); Tue, 29 Dec 2009 11:26:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752852AbZL2Q0l (ORCPT ); Tue, 29 Dec 2009 11:26:41 -0500 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.124]:34838 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752696AbZL2Q0j (ORCPT ); Tue, 29 Dec 2009 11:26:39 -0500 X-Authority-Analysis: v=1.0 c=1 a=2AtQYZA3fZAA:10 a=omOdbC7AAAAA:8 a=meVymXHHAAAA:8 a=HnuZ3tsWdX4qQYRs7acA:9 a=pvHgA0nkKHTYvWtWUSnrxBNeZ_AA:4 a=jeBq3FmKZ4MA:10 X-Cloudmark-Score: 0 X-Originating-IP: 74.67.89.75 Message-Id: <20091229162637.435505464@goodmis.org> User-Agent: quilt/0.48-1 Date: Tue, 29 Dec 2009 11:22:34 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Peter Zijlstra , Frederic Weisbecker , Li Zefan , Lai Jiangshan Subject: [PATCH 03/10] tracing: Have __dynamic_array() define a field References: <20091229162231.441352392@goodmis.org> Content-Disposition: inline; filename=0003-tracing-Have-__dynamic_array-define-a-field.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lai Jiangshan This is part of a patch set that removes the show_format method in the ftrace event macros. This patch set requires that all fields are added to the ftrace_event_call->fields. This patch changes __dynamic_array() to call trace_define_field() to include fields that use __dynamic_array(). Signed-off-by: Lai Jiangshan LKML-Reference: <4B273D36.8090100@cn.fujitsu.com> Signed-off-by: Steven Rostedt --- kernel/trace/trace_export.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/kernel/trace/trace_export.c b/kernel/trace/trace_export.c index 458e5bf..511bc36 100644 --- a/kernel/trace/trace_export.c +++ b/kernel/trace/trace_export.c @@ -174,7 +174,12 @@ ftrace_format_##name(struct ftrace_event_call *unused, \ return ret; #undef __dynamic_array -#define __dynamic_array(type, item) +#define __dynamic_array(type, item) \ + ret = trace_define_field(event_call, #type, #item, \ + offsetof(typeof(field), item), \ + 0, is_signed_type(type), FILTER_OTHER);\ + if (ret) \ + return ret; #undef FTRACE_ENTRY #define FTRACE_ENTRY(name, struct_name, id, tstruct, print) \ -- 1.6.5