From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754193AbdCBOvP (ORCPT ); Thu, 2 Mar 2017 09:51:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49374 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754168AbdCBOvM (ORCPT ); Thu, 2 Mar 2017 09:51:12 -0500 Message-ID: <1488465796.27824.7.camel@redhat.com> Subject: Re: tracing: add #undef to fix compile error From: Rik van Riel To: Steven Rostedt Cc: mingo@redhat.com, linux-kernel@vger.kernel.org Date: Thu, 02 Mar 2017 09:43:16 -0500 In-Reply-To: <20170301221134.6b6873cc@grimm.local.home> References: <20160928225554.13bd7ac6@annuminas.surriel.com> <20170301221134.6b6873cc@grimm.local.home> Organization: Red Hat, Inc Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 02 Mar 2017 14:43:19 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2017-03-01 at 22:11 -0500, Steven Rostedt wrote: > 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). I believe it is :) > > 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) > >