diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-03-18 12:48:29 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-03-18 12:48:29 +0400 |
| commit | 1f1b396758eff67b43b226904e1748f1e4272b4d (patch) | |
| tree | b9dc20f6c135edc4ff7857323430f71f619c3c7b /kernel/trace/trace.h | |
| parent | d610d98b5de6860feb21539726e9af7c9094151c (diff) | |
| parent | 613f04a0f51e6e68ac6fe571ab79da3c0a5eb4da (diff) | |
| download | linux-1f1b396758eff67b43b226904e1748f1e4272b4d.tar.xz | |
Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent
Pull tracing fixes from Steven Rostedt.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/trace.h')
| -rw-r--r-- | kernel/trace/trace.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 57d7e5397d56..2081971367ea 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -283,11 +283,15 @@ struct tracer { enum print_line_t (*print_line)(struct trace_iterator *iter); /* If you handled the flag setting, return 0 */ int (*set_flag)(u32 old_flags, u32 bit, int set); + /* Return 0 if OK with change, else return non-zero */ + int (*flag_changed)(struct tracer *tracer, + u32 mask, int set); struct tracer *next; struct tracer_flags *flags; bool print_max; bool use_max_tr; bool allocated_snapshot; + bool enabled; }; @@ -943,6 +947,8 @@ extern const char *__stop___trace_bprintk_fmt[]; void trace_printk_init_buffers(void); void trace_printk_start_comm(void); +int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set); +int set_tracer_flag(unsigned int mask, int enabled); #undef FTRACE_ENTRY #define FTRACE_ENTRY(call, struct_name, id, tstruct, print, filter) \ |