summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2012-11-02 22:32:25 +0100
committerSteven Rostedt <rostedt@goodmis.org>2013-01-23 05:38:00 +0100
commite46cbf75c621725964fe1f6e7013e8bcd86a0e3d (patch)
tree7d69185c7c58d1d6773e471852c03a6915d53f1a
parentftrace: Add context level recursion bit checking (diff)
downloadlinux-e46cbf75c621725964fe1f6e7013e8bcd86a0e3d.tar.xz
linux-e46cbf75c621725964fe1f6e7013e8bcd86a0e3d.zip
tracing: Make the trace recursion bits into enums
Convert the bits into enums which makes the code a little easier to maintain. Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r--kernel/trace/trace.h30
1 files changed, 17 insertions, 13 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index fe6ccff9cc70..5a095d6f088d 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -298,15 +298,18 @@ struct tracer {
#define trace_recursion_buffer() ((current)->trace_recursion & 0x3ff)
/* for function tracing recursion */
-#define TRACE_INTERNAL_BIT (1<<11)
-#define TRACE_INTERNAL_NMI_BIT (1<<12)
-#define TRACE_INTERNAL_IRQ_BIT (1<<13)
-#define TRACE_INTERNAL_SIRQ_BIT (1<<14)
-#define TRACE_GLOBAL_BIT (1<<15)
-#define TRACE_GLOBAL_NMI_BIT (1<<16)
-#define TRACE_GLOBAL_IRQ_BIT (1<<17)
-#define TRACE_GLOBAL_SIRQ_BIT (1<<18)
-#define TRACE_CONTROL_BIT (1<<19)
+enum {
+ TRACE_INTERNAL_BIT = 11,
+ TRACE_INTERNAL_NMI_BIT,
+ TRACE_INTERNAL_IRQ_BIT,
+ TRACE_INTERNAL_SIRQ_BIT,
+
+ TRACE_GLOBAL_BIT,
+ TRACE_GLOBAL_NMI_BIT,
+ TRACE_GLOBAL_IRQ_BIT,
+ TRACE_GLOBAL_SIRQ_BIT,
+
+ TRACE_CONTROL_BIT,
/*
* Abuse of the trace_recursion.
@@ -315,11 +318,12 @@ struct tracer {
* was called in irq context but we have irq tracing off. Since this
* can only be modified by current, we can reuse trace_recursion.
*/
-#define TRACE_IRQ_BIT (1<<20)
+ TRACE_IRQ_BIT,
+};
-#define trace_recursion_set(bit) do { (current)->trace_recursion |= (bit); } while (0)
-#define trace_recursion_clear(bit) do { (current)->trace_recursion &= ~(bit); } while (0)
-#define trace_recursion_test(bit) ((current)->trace_recursion & (bit))
+#define trace_recursion_set(bit) do { (current)->trace_recursion |= (1<<(bit)); } while (0)
+#define trace_recursion_clear(bit) do { (current)->trace_recursion &= ~(1<<(bit)); } while (0)
+#define trace_recursion_test(bit) ((current)->trace_recursion & (1<<(bit)))
#define TRACE_PIPE_ALL_CPU -1