diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-10-12 17:14:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-10-12 17:14:47 +0200 |
| commit | 910e94dd0cc5abacebf0bd5ffd859f61b9583857 (patch) | |
| tree | 7cb33f3f89f5fcdaa4dd4f5f19bb946ff495e9ac /kernel/trace/trace.h | |
| parent | Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | tracing: Do not allocate buffer for trace_marker (diff) | |
| download | linux-910e94dd0cc5abacebf0bd5ffd859f61b9583857.tar.xz linux-910e94dd0cc5abacebf0bd5ffd859f61b9583857.zip | |
Merge branch 'tip/perf/core' of git://github.com/rostedt/linux into perf/core
Diffstat (limited to 'kernel/trace/trace.h')
| -rw-r--r-- | kernel/trace/trace.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 616846bcfee5..092e1f8d18dc 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -579,11 +579,13 @@ static inline int ftrace_trace_task(struct task_struct *task) return test_tsk_trace_trace(task); } +extern int ftrace_is_dead(void); #else static inline int ftrace_trace_task(struct task_struct *task) { return 1; } +static inline int ftrace_is_dead(void) { return 0; } #endif /* @@ -761,16 +763,10 @@ struct filter_pred { filter_pred_fn_t fn; u64 val; struct regex regex; - /* - * Leaf nodes use field_name, ops is used by AND and OR - * nodes. The field_name is always freed when freeing a pred. - * We can overload field_name for ops and have it freed - * as well. - */ - union { - char *field_name; - unsigned short *ops; - }; + unsigned short *ops; +#ifdef CONFIG_FTRACE_STARTUP_TEST + struct ftrace_event_field *field; +#endif int offset; int not; int op; |