[PATCH 1/3] x86, tracing: fix x86 exceptions trace header

From	Dave Hansen <dave@sr71.net>
Newsgroups	linux.kernel
Subject	[PATCH 1/3] x86, tracing: fix x86 exceptions trace header
Date	2016-07-22 20:10 +0200
Message-ID	<rXN3z-Qn-1@gated-at.bofh.it> (permalink)
References	<rXN3z-Qn-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Dave Hansen <dave.hansen@linux.intel.com>

The various tracing headers pass some variables into the tracing
code itself to indicate things like the name of the tracing
directory where the tracepoints should be located in debugfs.
The general pattern is to #undef them before redefining them.

But, if all instances don't do this, and two different trace
headers get included in the same file, you'll get macro
redefinition compile errors.

Fix up the x86 exception tracing code to properly #undef one of
its macros.

Note that this isn't a problem in practice until the next patch
in this series is applied and adds a #include of the FPU
tracing header.

Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@redhat.com>
---

 b/arch/x86/include/asm/trace/exceptions.h |    1 +
 1 file changed, 1 insertion(+)

diff -puN arch/x86/include/asm/trace/exceptions.h~pkeys-899-fix-exceptions-trace-define arch/x86/include/asm/trace/exceptions.h
--- a/arch/x86/include/asm/trace/exceptions.h~pkeys-899-fix-exceptions-trace-define	2016-07-22 10:52:32.543331471 -0700
+++ b/arch/x86/include/asm/trace/exceptions.h	2016-07-22 10:52:32.546331607 -0700
@@ -45,6 +45,7 @@ DEFINE_PAGE_FAULT_EVENT(page_fault_kerne
 
 #undef TRACE_INCLUDE_PATH
 #define TRACE_INCLUDE_PATH .
+#undef  TRACE_INCLUDE_FILE
 #define TRACE_INCLUDE_FILE exceptions
 #endif /*  _TRACE_PAGE_FAULT_H */
 
_

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 1/3] x86, tracing: fix x86 exceptions trace header Dave Hansen <dave@sr71.net> - 2016-07-22 20:10 +0200

csiph-web