Skip to content

Commit e46cbf7

Browse files
Steven Rostedtrostedt
authored andcommitted
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>
1 parent c29f122 commit e46cbf7

File tree

1 file changed

+17
-13
lines changed

1 file changed

+17
-13
lines changed

kernel/trace/trace.h

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -298,15 +298,18 @@ struct tracer {
298298
#define trace_recursion_buffer() ((current)->trace_recursion & 0x3ff)
299299

300300
/* for function tracing recursion */
301-
#define TRACE_INTERNAL_BIT (1<<11)
302-
#define TRACE_INTERNAL_NMI_BIT (1<<12)
303-
#define TRACE_INTERNAL_IRQ_BIT (1<<13)
304-
#define TRACE_INTERNAL_SIRQ_BIT (1<<14)
305-
#define TRACE_GLOBAL_BIT (1<<15)
306-
#define TRACE_GLOBAL_NMI_BIT (1<<16)
307-
#define TRACE_GLOBAL_IRQ_BIT (1<<17)
308-
#define TRACE_GLOBAL_SIRQ_BIT (1<<18)
309-
#define TRACE_CONTROL_BIT (1<<19)
301+
enum {
302+
TRACE_INTERNAL_BIT = 11,
303+
TRACE_INTERNAL_NMI_BIT,
304+
TRACE_INTERNAL_IRQ_BIT,
305+
TRACE_INTERNAL_SIRQ_BIT,
306+
307+
TRACE_GLOBAL_BIT,
308+
TRACE_GLOBAL_NMI_BIT,
309+
TRACE_GLOBAL_IRQ_BIT,
310+
TRACE_GLOBAL_SIRQ_BIT,
311+
312+
TRACE_CONTROL_BIT,
310313

311314
/*
312315
* Abuse of the trace_recursion.
@@ -315,11 +318,12 @@ struct tracer {
315318
* was called in irq context but we have irq tracing off. Since this
316319
* can only be modified by current, we can reuse trace_recursion.
317320
*/
318-
#define TRACE_IRQ_BIT (1<<20)
321+
TRACE_IRQ_BIT,
322+
};
319323

320-
#define trace_recursion_set(bit) do { (current)->trace_recursion |= (bit); } while (0)
321-
#define trace_recursion_clear(bit) do { (current)->trace_recursion &= ~(bit); } while (0)
322-
#define trace_recursion_test(bit) ((current)->trace_recursion & (bit))
324+
#define trace_recursion_set(bit) do { (current)->trace_recursion |= (1<<(bit)); } while (0)
325+
#define trace_recursion_clear(bit) do { (current)->trace_recursion &= ~(1<<(bit)); } while (0)
326+
#define trace_recursion_test(bit) ((current)->trace_recursion & (1<<(bit)))
323327

324328
#define TRACE_PIPE_ALL_CPU -1
325329

0 commit comments

Comments
 (0)