litmus/preempt.h: do not pollute namespace with TRACE()

This file is indirectly included in a _a lot_ of Linux. A generic name
like TRACE causes a symbol clashes in drivers, SquashFS, etc.

To avoid this, use only the LITMUS-prefixed version in preempt.h.

1 files changed, 6 insertions, 3 deletions

diff --git a/include/litmus/preempt.h b/include/litmus/preempt.h
index 8f8bb635cb21..ffb602772896 100644
--- a/include/litmus/preempt.h
+++ b/include/litmus/preempt.h
@@ -6,8 +6,6 @@
 #include <linux/percpu.h>
 #include <asm/atomic.h>
 
-#include <litmus/debug_trace.h>
-
 DECLARE_PER_CPU(bool, litmus_preemption_in_progress);
 
 /* is_current_running() is legacy macro (and a hack) that is used to make
@@ -37,8 +35,13 @@ DECLARE_PER_CPU(bool, litmus_preemption_in_progress);
 DECLARE_PER_CPU_SHARED_ALIGNED(atomic_t, resched_state);
 
 #ifdef CONFIG_PREEMPT_STATE_TRACE
+/* this file is included widely --- be careful not to pollute the namespace
+ * with the TRACE() symbol */
+#define LITMUS_DEBUG_TRACE_DONT_POLLUTE_NAMESPACE
+#include <litmus/debug_trace.h>
+#undef LITMUS_DEBUG_TRACE_DONT_POLLUTE_NAMESPACE
 const char* sched_state_name(int s);
-#define TRACE_STATE(fmt, args...) TRACE("SCHED_STATE " fmt, args)
+#define TRACE_STATE(fmt, args...) LITMUS_TRACE("SCHED_STATE " fmt, args)
 #else
 #define TRACE_STATE(fmt, args...) /* ignore */
 #endif