Home Home > GIT Browse > SLE11-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Benes <mbenes@suse.cz>2018-12-21 15:48:07 +0100
committerMiroslav Benes <mbenes@suse.cz>2018-12-21 15:48:07 +0100
commit1fa30b92a0fa6a45a111365d2aea51bf81814f60 (patch)
treec4bcdc5b67d8021eb4cb4ac3a8bd516c8581a770
parentc5708194f311e8b80572da9aceff0bc0ab7f82b4 (diff)
tracing: Add #undef to fix compile error (bsc#1120226).
-rw-r--r--patches.fixes/tracing-add-undef-to-fix-compile-error.patch40
-rw-r--r--series.conf1
2 files changed, 41 insertions, 0 deletions
diff --git a/patches.fixes/tracing-add-undef-to-fix-compile-error.patch b/patches.fixes/tracing-add-undef-to-fix-compile-error.patch
new file mode 100644
index 0000000000..7a9a2f8aac
--- /dev/null
+++ b/patches.fixes/tracing-add-undef-to-fix-compile-error.patch
@@ -0,0 +1,40 @@
+From: Rik van Riel <riel@redhat.com>
+Date: Wed, 28 Sep 2016 22:55:54 -0400
+Subject: tracing: Add #undef to fix compile error
+Git-commit: bf7165cfa23695c51998231c4efa080fe1d3548d
+Patch-mainline: v4.11-rc2
+References: bsc#1120226
+
+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>
+Acked-by: Miroslav Benes <mbenes@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 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)
+
diff --git a/series.conf b/series.conf
index 5f70ed6083..cbb3773ebb 100644
--- a/series.conf
+++ b/series.conf
@@ -23188,6 +23188,7 @@
patches.fixes/tracepoints-do-not-trace-when-cpu-is-offline.patch
patches.fixes/tracing-fix-check-for-cpu-online-when-event-is-disabled.patch
patches.fixes/tracing-move-mutex-to-protect-against-resetting-of-seq-data.patch
+ patches.fixes/tracing-add-undef-to-fix-compile-error.patch
########################################################
# KVM patches