From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752832AbcG2PI1 (ORCPT ); Fri, 29 Jul 2016 11:08:27 -0400 Received: from smtprelay0197.hostedemail.com ([216.40.44.197]:33446 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751927AbcG2PIX (ORCPT ); Fri, 29 Jul 2016 11:08:23 -0400 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::::,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:3138:3139:3140:3141:3142:3353:3622:3865:3866:3867:3868:3870:3871:3873:3874:4321:5007:6261:7576:7875:7903:10004:10400:10848:10967:11026:11232:11473:11657:11658:11914:12043:12438:12517:12519:12555:12740:13069:13225:13229:13311:13357:13439:14181:14659:14721:21080:21434:21451:30012:30029:30036:30054:30070: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:6,LUA_SUMMARY:none X-HE-Tag: debt82_832e86c9fdb1e X-Filterd-Recvd-Size: 2744 Date: Fri, 29 Jul 2016 11:08:20 -0400 From: Steven Rostedt To: Dave Hansen Cc: linux-kernel@vger.kernel.org, x86@kernel.org, luto@kernel.org, dave.hansen@linux.intel.com, mingo@redhat.com Subject: Re: [PATCH 1/3] x86, tracing: fix x86 exceptions trace header Message-ID: <20160729110820.6a5cc5fb@gandalf.local.home> In-Reply-To: <20160722180311.7488A4CA@viggo.jf.intel.com> References: <20160722180310.99F5BCFF@viggo.jf.intel.com> <20160722180311.7488A4CA@viggo.jf.intel.com> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; 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 Fri, 22 Jul 2016 11:03:11 -0700 Dave Hansen wrote: > From: Dave Hansen > > The various tracing headers pass some variables into the tracing > code itself to indicate things like the name of the tracing > directory where the tracepoints should be located in debugfs. > The general pattern is to #undef them before redefining them. > > But, if all instances don't do this, and two different trace > headers get included in the same file, you'll get macro > redefinition compile errors. > > Fix up the x86 exception tracing code to properly #undef one of > its macros. > > Note that this isn't a problem in practice until the next patch > in this series is applied and adds a #include of the FPU > tracing header. > > Signed-off-by: Dave Hansen > Cc: Steven Rostedt > Cc: Ingo Molnar > --- > > b/arch/x86/include/asm/trace/exceptions.h | 1 + > 1 file changed, 1 insertion(+) > > diff -puN arch/x86/include/asm/trace/exceptions.h~pkeys-899-fix-exceptions-trace-define arch/x86/include/asm/trace/exceptions.h > --- a/arch/x86/include/asm/trace/exceptions.h~pkeys-899-fix-exceptions-trace-define 2016-07-22 10:52:32.543331471 -0700 > +++ b/arch/x86/include/asm/trace/exceptions.h 2016-07-22 10:52:32.546331607 -0700 > @@ -45,6 +45,7 @@ DEFINE_PAGE_FAULT_EVENT(page_fault_kerne > > #undef TRACE_INCLUDE_PATH > #define TRACE_INCLUDE_PATH . > +#undef TRACE_INCLUDE_FILE > #define TRACE_INCLUDE_FILE exceptions > #endif /* _TRACE_PAGE_FAULT_H */ > > _ Acked-by: Steven Rostedt I had to check, but my sample code in samples/trace_events/trace-events-sample.h does indeed include the #undef of TRACE_INCLUDE_FILE too. -- Steve