From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753784AbdCBDLs (ORCPT ); Wed, 1 Mar 2017 22:11:48 -0500 Received: from smtprelay0071.hostedemail.com ([216.40.44.71]:42968 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753584AbdCBDLn (ORCPT ); Wed, 1 Mar 2017 22:11:43 -0500 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,,::::::,RULES_HIT:41:355:379:541:599:800:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1437:1515:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:2393:2553:2559:2562:2693:3138:3139:3140:3141:3142:3352:3622:3865:3866:3867:3868:3870:3871:3872:3874:4321:5007:6261:7875:7903:10004:10400:10848:10967:11026:11232:11473:11658:11914:12043:12296:12438:12555:12663:12740:12760:12895:12986:13069:13311:13357:13439:14096:14097:14181:14659:14721:21080:21434:21451:30012:30054:30090:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:4,LUA_SUMMARY:none X-HE-Tag: pin24_2b1b714089762 X-Filterd-Recvd-Size: 2123 Date: Wed, 1 Mar 2017 22:11:34 -0500 From: Steven Rostedt To: Rik van Riel Cc: mingo@redhat.com, linux-kernel@vger.kernel.org Subject: Re: tracing: add #undef to fix compile error Message-ID: <20170301221134.6b6873cc@grimm.local.home> In-Reply-To: <20160928225554.13bd7ac6@annuminas.surriel.com> References: <20160928225554.13bd7ac6@annuminas.surriel.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 28 Sep 2016 22:55:54 -0400 Rik van Riel wrote: > There are several trace include files that define TRACE_INCLUDE_FILE. > > Include several of them in the same .c file (as I currently have in > some code I am working on), and the compile will blow up with a > "warning: "TRACE_INCLUDE_FILE" redefined #define TRACE_INCLUDE_FILE syscalls" > > Every other include file in include/trace/events/ avoids that issue > by having a #undef TRACE_INCLUDE_FILE before the #define; syscalls.h > should have one, too. Cleaning out my INBOX, I stumbled over this patch. It looks like I missed it. I'm guessing this is still an issue? (Too lazy to actually look deeper, well just too tired at the moment). -- Steve > > Signed-off-by: Rik van Riel > --- > include/trace/events/syscalls.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/include/trace/events/syscalls.h b/include/trace/events/syscalls.h > index 14e49c798135..b35533b94277 100644 > --- a/include/trace/events/syscalls.h > +++ b/include/trace/events/syscalls.h > @@ -1,5 +1,6 @@ > #undef TRACE_SYSTEM > #define TRACE_SYSTEM raw_syscalls > +#undef TRACE_INCLUDE_FILE > #define TRACE_INCLUDE_FILE syscalls > > #if !defined(_TRACE_EVENTS_SYSCALLS_H) || defined(TRACE_HEADER_MULTI_READ)