From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754617AbZHYGtf (ORCPT ); Tue, 25 Aug 2009 02:49:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752433AbZHYGte (ORCPT ); Tue, 25 Aug 2009 02:49:34 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:50371 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753960AbZHYGte (ORCPT ); Tue, 25 Aug 2009 02:49:34 -0400 Message-ID: <4A93895F.4010708@cn.fujitsu.com> Date: Tue, 25 Aug 2009 14:49:03 +0800 From: Xiao Guangrong User-Agent: Thunderbird 2.0.0.6 (Windows/20070728) MIME-Version: 1.0 To: Ingo Molnar CC: Steven Rostedt , Frederic Weisbecker , Neil Horman , Wei Yongjun , David Miller , Netdev , LKML Subject: [PATCH 1/2] trace_events: fix napi's tracepoint References: <4A937EF5.4040505@cn.fujitsu.com> In-Reply-To: <4A937EF5.4040505@cn.fujitsu.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, the napi's tracepoint works will is depend on "DECLARE_TRACE" definiens in include/trace/define_trace.h, like below: #include // include define_trace.h #include there have error, if we remove "#include " or include napi.h in the front of include skb.h, It should depend on the definiens in include/linux/tracepoint.h and we can remove the "DECLARE_TRACE" definiens in include/trace/define_trace.h, because "TRACE_EVENT" not use it Signed-off-by: Xiao Guangrong --- include/trace/define_trace.h | 4 ---- net/core/net-traces.c | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/trace/define_trace.h b/include/trace/define_trace.h index f7a7ae1..76e93bf 100644 --- a/include/trace/define_trace.h +++ b/include/trace/define_trace.h @@ -26,10 +26,6 @@ #define TRACE_EVENT(name, proto, args, tstruct, assign, print) \ DEFINE_TRACE(name) -#undef DECLARE_TRACE -#define DECLARE_TRACE(name, proto, args) \ - DEFINE_TRACE(name) - #undef TRACE_INCLUDE #undef __TRACE_INCLUDE diff --git a/net/core/net-traces.c b/net/core/net-traces.c index f1e982c..42bda72 100644 --- a/net/core/net-traces.c +++ b/net/core/net-traces.c @@ -19,13 +19,15 @@ #include #include #include +#include #include #include #define CREATE_TRACE_POINTS #include -#include + +DEFINE_TRACE(napi_poll); EXPORT_TRACEPOINT_SYMBOL_GPL(kfree_skb); -- 1.6.1.2