linux-kernel - Re: tracing: add #undef to fix compile error

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20170301221134.6b6873cc@grimm.local.home>
Date:   Wed, 1 Mar 2017 22:11:34 -0500
From:   Steven Rostedt <rostedt@...dmis.org>
To:     Rik van Riel <riel@...hat.com>
Cc:     mingo@...hat.com, linux-kernel@...r.kernel.org
Subject: Re: tracing: add #undef to fix compile error

On Wed, 28 Sep 2016 22:55:54 -0400
Rik van Riel <riel@...hat.com> 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 <riel@...hat.com>
> ---
>  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)