diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-07-23 03:10:29 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-07-23 03:10:29 -0400 |
commit | 3a01736e70a7d629140695ba46a901266b4460cc (patch) | |
tree | 49ff8ce1e7c6a267f0ce84b5daddbe6666bc4253 /kernel/trace/trace.h | |
parent | 4c21adf26f8fcf86a755b9b9f55c2e9fd241e1fb (diff) | |
parent | 24a461d537f49f9da6533d83100999ea08c6c755 (diff) |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'kernel/trace/trace.h')
-rw-r--r-- | kernel/trace/trace.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 638a5887e2ec..d05c873dd4b2 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h | |||
@@ -274,6 +274,7 @@ struct tracer { | |||
274 | struct tracer *next; | 274 | struct tracer *next; |
275 | int print_max; | 275 | int print_max; |
276 | struct tracer_flags *flags; | 276 | struct tracer_flags *flags; |
277 | int use_max_tr; | ||
277 | }; | 278 | }; |
278 | 279 | ||
279 | 280 | ||
@@ -581,6 +582,7 @@ enum trace_iterator_flags { | |||
581 | TRACE_ITER_LATENCY_FMT = 0x20000, | 582 | TRACE_ITER_LATENCY_FMT = 0x20000, |
582 | TRACE_ITER_SLEEP_TIME = 0x40000, | 583 | TRACE_ITER_SLEEP_TIME = 0x40000, |
583 | TRACE_ITER_GRAPH_TIME = 0x80000, | 584 | TRACE_ITER_GRAPH_TIME = 0x80000, |
585 | TRACE_ITER_RECORD_CMD = 0x100000, | ||
584 | }; | 586 | }; |
585 | 587 | ||
586 | /* | 588 | /* |
@@ -713,6 +715,8 @@ filter_check_discard(struct ftrace_event_call *call, void *rec, | |||
713 | return 0; | 715 | return 0; |
714 | } | 716 | } |
715 | 717 | ||
718 | extern void trace_event_enable_cmd_record(bool enable); | ||
719 | |||
716 | extern struct mutex event_mutex; | 720 | extern struct mutex event_mutex; |
717 | extern struct list_head ftrace_events; | 721 | extern struct list_head ftrace_events; |
718 | 722 | ||