diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-09-26 07:21:33 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-09-26 07:21:33 -0400 |
| commit | ac2ba2b363a40a2431506d446985af4e4108b0d2 (patch) | |
| tree | dcabf0074a34ce0ebe5c182b824ff9eb830010ae /kernel/trace/trace.h | |
| parent | a91f408e4435d4f572392295ee47756b6f5011c7 (diff) | |
| parent | 8781915ad2716adcd8cd5cc52cee791fc8b00fdf (diff) | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Pull tracing updates from Steve Rostedt.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 593debefc4e9..63a2da0b9a6e 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h | |||
| @@ -680,6 +680,7 @@ enum trace_iterator_flags { | |||
| 680 | TRACE_ITER_OVERWRITE = 0x200000, | 680 | TRACE_ITER_OVERWRITE = 0x200000, |
| 681 | TRACE_ITER_STOP_ON_FREE = 0x400000, | 681 | TRACE_ITER_STOP_ON_FREE = 0x400000, |
| 682 | TRACE_ITER_IRQ_INFO = 0x800000, | 682 | TRACE_ITER_IRQ_INFO = 0x800000, |
| 683 | TRACE_ITER_MARKERS = 0x1000000, | ||
| 683 | }; | 684 | }; |
| 684 | 685 | ||
| 685 | /* | 686 | /* |