diff options
Diffstat (limited to 'kernel/trace/trace.h')
-rw-r--r-- | kernel/trace/trace.h | 30 |
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 { | |||
298 | #define trace_recursion_buffer() ((current)->trace_recursion & 0x3ff) | 298 | #define trace_recursion_buffer() ((current)->trace_recursion & 0x3ff) |
299 | 299 | ||
300 | /* for function tracing recursion */ | 300 | /* for function tracing recursion */ |
301 | #define TRACE_INTERNAL_BIT (1<<11) | 301 | enum { |
302 | #define TRACE_INTERNAL_NMI_BIT (1<<12) | 302 | TRACE_INTERNAL_BIT = 11, |
303 | #define TRACE_INTERNAL_IRQ_BIT (1<<13) | 303 | TRACE_INTERNAL_NMI_BIT, |
304 | #define TRACE_INTERNAL_SIRQ_BIT (1<<14) | 304 | TRACE_INTERNAL_IRQ_BIT, |
305 | #define TRACE_GLOBAL_BIT (1<<15) | 305 | TRACE_INTERNAL_SIRQ_BIT, |
306 | #define TRACE_GLOBAL_NMI_BIT (1<<16) | 306 | |
307 | #define TRACE_GLOBAL_IRQ_BIT (1<<17) | 307 | TRACE_GLOBAL_BIT, |
308 | #define TRACE_GLOBAL_SIRQ_BIT (1<<18) | 308 | TRACE_GLOBAL_NMI_BIT, |
309 | #define TRACE_CONTROL_BIT (1<<19) | 309 | TRACE_GLOBAL_IRQ_BIT, |
310 | TRACE_GLOBAL_SIRQ_BIT, | ||
311 | |||
312 | TRACE_CONTROL_BIT, | ||
310 | 313 | ||
311 | /* | 314 | /* |
312 | * Abuse of the trace_recursion. | 315 | * Abuse of the trace_recursion. |
@@ -315,11 +318,12 @@ struct tracer { | |||
315 | * was called in irq context but we have irq tracing off. Since this | 318 | * was called in irq context but we have irq tracing off. Since this |
316 | * can only be modified by current, we can reuse trace_recursion. | 319 | * can only be modified by current, we can reuse trace_recursion. |
317 | */ | 320 | */ |
318 | #define TRACE_IRQ_BIT (1<<20) | 321 | TRACE_IRQ_BIT, |
322 | }; | ||
319 | 323 | ||
320 | #define trace_recursion_set(bit) do { (current)->trace_recursion |= (bit); } while (0) | 324 | #define trace_recursion_set(bit) do { (current)->trace_recursion |= (1<<(bit)); } while (0) |
321 | #define trace_recursion_clear(bit) do { (current)->trace_recursion &= ~(bit); } while (0) | 325 | #define trace_recursion_clear(bit) do { (current)->trace_recursion &= ~(1<<(bit)); } while (0) |
322 | #define trace_recursion_test(bit) ((current)->trace_recursion & (bit)) | 326 | #define trace_recursion_test(bit) ((current)->trace_recursion & (1<<(bit))) |
323 | 327 | ||
324 | #define TRACE_PIPE_ALL_CPU -1 | 328 | #define TRACE_PIPE_ALL_CPU -1 |
325 | 329 | ||