summary refs log tree commit diff
path: root/include/trace
diff options
context:
space:
mode:
authorRik van Riel <riel@redhat.com>2016-09-28 22:55:54 -0400
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2017-03-03 09:45:01 -0500
commitbf7165cfa23695c51998231c4efa080fe1d3548d (patch)
tree2c4ae45c32c45041686a77a2fb3618874c29f98e /include/trace
parentb17ef2ed624aa7c1f68ed11acd16ecbf80fe01d7 (diff)
downloadlinux-bf7165cfa23695c51998231c4efa080fe1d3548d.tar.gz
tracing: Add #undef to fix compile error
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

Cc: stable@vger.kernel.org
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>
Diffstat (limited to 'include/trace')
-rw-r--r--include/trace/events/syscalls.h1
1 files changed, 1 insertions, 0 deletions
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)