Module: xenomai-3
Branch: stable-3.0.x
Commit: 577849bb20e109c3be2c0da9744258ce6e99b438
URL:    
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=577849bb20e109c3be2c0da9744258ce6e99b438

Author: Philippe Gerum <r...@xenomai.org>
Date:   Tue May  2 10:22:39 2017 +0200

cobalt/trace: do not inadvertently inherit TRACE_INCLUDE_PATH

---

 kernel/cobalt/trace/cobalt-core.h  |    6 +++---
 kernel/cobalt/trace/cobalt-posix.h |    5 +++--
 kernel/cobalt/trace/cobalt-rtdm.h  |    5 +++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/kernel/cobalt/trace/cobalt-core.h 
b/kernel/cobalt/trace/cobalt-core.h
index dde5da3..ae74290 100644
--- a/kernel/cobalt/trace/cobalt-core.h
+++ b/kernel/cobalt/trace/cobalt-core.h
@@ -19,14 +19,11 @@
  */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM cobalt_core
-#undef TRACE_INCLUDE_FILE
-#define TRACE_INCLUDE_FILE cobalt-core
 
 #if !defined(_TRACE_COBALT_CORE_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_COBALT_CORE_H
 
 #include <linux/tracepoint.h>
-#include <linux/sched.h>
 
 DECLARE_EVENT_CLASS(thread_event,
        TP_PROTO(struct xnthread *thread),
@@ -635,4 +632,7 @@ DEFINE_EVENT(synch_post_event, cobalt_synch_forget,
 #endif /* _TRACE_COBALT_CORE_H */
 
 /* This part must be outside protection */
+#undef TRACE_INCLUDE_PATH
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_FILE cobalt-core
 #include <trace/define_trace.h>
diff --git a/kernel/cobalt/trace/cobalt-posix.h 
b/kernel/cobalt/trace/cobalt-posix.h
index 3d0e20c..eaac70d 100644
--- a/kernel/cobalt/trace/cobalt-posix.h
+++ b/kernel/cobalt/trace/cobalt-posix.h
@@ -19,8 +19,6 @@
  */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM cobalt_posix
-#undef TRACE_INCLUDE_FILE
-#define TRACE_INCLUDE_FILE cobalt-posix
 
 #if !defined(_TRACE_COBALT_POSIX_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_COBALT_POSIX_H
@@ -1064,4 +1062,7 @@ DEFINE_EVENT(cobalt_event_ident, cobalt_event_inquire,
 #endif /* _TRACE_COBALT_POSIX_H */
 
 /* This part must be outside protection */
+#undef TRACE_INCLUDE_PATH
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_FILE cobalt-posix
 #include <trace/define_trace.h>
diff --git a/kernel/cobalt/trace/cobalt-rtdm.h 
b/kernel/cobalt/trace/cobalt-rtdm.h
index d548a0b..10bdb3a 100644
--- a/kernel/cobalt/trace/cobalt-rtdm.h
+++ b/kernel/cobalt/trace/cobalt-rtdm.h
@@ -19,8 +19,6 @@
  */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM cobalt_rtdm
-#undef TRACE_INCLUDE_FILE
-#define TRACE_INCLUDE_FILE cobalt-rtdm
 
 #if !defined(_TRACE_COBALT_RTDM_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_COBALT_RTDM_H
@@ -522,4 +520,7 @@ TRACE_EVENT(cobalt_driver_mutex_wait,
 #endif /* _TRACE_COBALT_RTDM_H */
 
 /* This part must be outside protection */
+#undef TRACE_INCLUDE_PATH
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_FILE cobalt-rtdm
 #include <trace/define_trace.h>


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
https://xenomai.org/mailman/listinfo/xenomai-git

Reply via email to