aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-05-14 08:43:40 -0400
committerIngo Molnar <mingo@kernel.org>2012-05-14 08:43:40 -0400
commit9cba26e66d09bf394ae5a739627a1dc8b7cae6f4 (patch)
treef03743d576a0c7826b9921ad47e70370ebe80a22 /kernel/trace/trace.h
parentec83db0f78cd44c3b586ec1c3a348d1a8a389797 (diff)
parent73eff9f56e15598c8399c0b86899fd889b97f085 (diff)
Merge branch 'perf/uprobes' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/uprobes
Diffstat (limited to 'kernel/trace/trace.h')
-rw-r--r--kernel/trace/trace.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 1bcdbec95a11..a7d28e033a96 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -136,6 +136,7 @@ struct trace_array_cpu {
136 atomic_t disabled; 136 atomic_t disabled;
137 void *buffer_page; /* ring buffer spare */ 137 void *buffer_page; /* ring buffer spare */
138 138
139 unsigned long entries;
139 unsigned long saved_latency; 140 unsigned long saved_latency;
140 unsigned long critical_start; 141 unsigned long critical_start;
141 unsigned long critical_end; 142 unsigned long critical_end;
@@ -157,7 +158,6 @@ struct trace_array_cpu {
157 */ 158 */
158struct trace_array { 159struct trace_array {
159 struct ring_buffer *buffer; 160 struct ring_buffer *buffer;
160 unsigned long entries;
161 int cpu; 161 int cpu;
162 int buffer_disabled; 162 int buffer_disabled;
163 cycle_t time_start; 163 cycle_t time_start;
@@ -831,6 +831,8 @@ extern struct list_head ftrace_events;
831extern const char *__start___trace_bprintk_fmt[]; 831extern const char *__start___trace_bprintk_fmt[];
832extern const char *__stop___trace_bprintk_fmt[]; 832extern const char *__stop___trace_bprintk_fmt[];
833 833
834void trace_printk_init_buffers(void);
835
834#undef FTRACE_ENTRY 836#undef FTRACE_ENTRY
835#define FTRACE_ENTRY(call, struct_name, id, tstruct, print, filter) \ 837#define FTRACE_ENTRY(call, struct_name, id, tstruct, print, filter) \
836 extern struct ftrace_event_call \ 838 extern struct ftrace_event_call \