diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-18 01:59:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-18 01:59:56 -0400 |
| commit | 327019b01e068d66dada6a8b2571180ab3674d20 (patch) | |
| tree | c81354a509d6962f6878145fcf3cdbe50a000a89 /kernel/trace/trace.h | |
| parent | 03418c7efaa429dc7647ac93e3862e3fe1816873 (diff) | |
| parent | 62524d55e5b9ffe36e3bf3dd7a594114f150b449 (diff) | |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'kernel/trace/trace.h')
| -rw-r--r-- | kernel/trace/trace.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 546bcbd92a0c..38276d1638e3 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h | |||
| @@ -684,6 +684,7 @@ enum trace_iterator_flags { | |||
| 684 | TRACE_ITER_PRINTK_MSGONLY = 0x10000, | 684 | TRACE_ITER_PRINTK_MSGONLY = 0x10000, |
| 685 | TRACE_ITER_CONTEXT_INFO = 0x20000, /* Print pid/cpu/time */ | 685 | TRACE_ITER_CONTEXT_INFO = 0x20000, /* Print pid/cpu/time */ |
| 686 | TRACE_ITER_LATENCY_FMT = 0x40000, | 686 | TRACE_ITER_LATENCY_FMT = 0x40000, |
| 687 | TRACE_ITER_GLOBAL_CLK = 0x80000, | ||
| 687 | }; | 688 | }; |
| 688 | 689 | ||
| 689 | /* | 690 | /* |