lkml.org 
[lkml]   [2017]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 014/142] tracing: Add #undef to fix compile error
    Date
    From: Rik van Riel <riel@redhat.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit bf7165cfa23695c51998231c4efa080fe1d3548d upstream.

    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.

    Link: http://lkml.kernel.org/r/20160928225554.13bd7ac6@annuminas.surriel.com

    Fixes: b8007ef74222 ("tracing: Separate raw syscall from syscall tracer")
    Signed-off-by: Rik van Riel <riel@redhat.com>
    Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    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 5a4c04a75b3d..55c9b99ff9a6 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)
    --
    2.12.2
    \
     
     \ /
      Last update: 2017-04-10 18:13    [W:4.232 / U:0.232 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site