diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-03-22 09:17:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-03-22 09:17:57 +0100 |
| commit | 6605f9ac69593d480324ba5fa05f64cfebf4db2f (patch) | |
| tree | 4c64d89d04ad24911d0eca7f3feb0012e4014dae /kernel/trace/trace.h | |
| parent | ad2a8e6078a16d3b61b530f1447110841c36ae56 (diff) | |
| parent | 93d68e52295fb8b65ded6db49e32e63b6a203e0b (diff) | |
| download | op-kernel-dev-6605f9ac69593d480324ba5fa05f64cfebf4db2f.zip op-kernel-dev-6605f9ac69593d480324ba5fa05f64cfebf4db2f.tar.gz | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent
Diffstat (limited to 'kernel/trace/trace.h')
| -rw-r--r-- | kernel/trace/trace.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 54faec7..95059f0 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -154,6 +154,7 @@ struct trace_array { struct ring_buffer *buffer; unsigned long entries; int cpu; + int buffer_disabled; cycle_t time_start; struct task_struct *waiter; struct trace_array_cpu *data[NR_CPUS]; @@ -835,13 +836,11 @@ extern const char *__stop___trace_bprintk_fmt[]; filter) #include "trace_entries.h" -#ifdef CONFIG_PERF_EVENTS #ifdef CONFIG_FUNCTION_TRACER int perf_ftrace_event_register(struct ftrace_event_call *call, enum trace_reg type, void *data); #else #define perf_ftrace_event_register NULL #endif /* CONFIG_FUNCTION_TRACER */ -#endif /* CONFIG_PERF_EVENTS */ #endif /* _LINUX_KERNEL_TRACE_H */ |
