diff options
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 54faec790bc1..95059f091a24 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h | |||
@@ -154,6 +154,7 @@ struct trace_array { | |||
154 | struct ring_buffer *buffer; | 154 | struct ring_buffer *buffer; |
155 | unsigned long entries; | 155 | unsigned long entries; |
156 | int cpu; | 156 | int cpu; |
157 | int buffer_disabled; | ||
157 | cycle_t time_start; | 158 | cycle_t time_start; |
158 | struct task_struct *waiter; | 159 | struct task_struct *waiter; |
159 | struct trace_array_cpu *data[NR_CPUS]; | 160 | struct trace_array_cpu *data[NR_CPUS]; |
@@ -835,13 +836,11 @@ extern const char *__stop___trace_bprintk_fmt[]; | |||
835 | filter) | 836 | filter) |
836 | #include "trace_entries.h" | 837 | #include "trace_entries.h" |
837 | 838 | ||
838 | #ifdef CONFIG_PERF_EVENTS | ||
839 | #ifdef CONFIG_FUNCTION_TRACER | 839 | #ifdef CONFIG_FUNCTION_TRACER |
840 | int perf_ftrace_event_register(struct ftrace_event_call *call, | 840 | int perf_ftrace_event_register(struct ftrace_event_call *call, |
841 | enum trace_reg type, void *data); | 841 | enum trace_reg type, void *data); |
842 | #else | 842 | #else |
843 | #define perf_ftrace_event_register NULL | 843 | #define perf_ftrace_event_register NULL |
844 | #endif /* CONFIG_FUNCTION_TRACER */ | 844 | #endif /* CONFIG_FUNCTION_TRACER */ |
845 | #endif /* CONFIG_PERF_EVENTS */ | ||
846 | 845 | ||
847 | #endif /* _LINUX_KERNEL_TRACE_H */ | 846 | #endif /* _LINUX_KERNEL_TRACE_H */ |