diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-05-14 14:43:40 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-05-14 14:43:40 +0200 |
| commit | 9cba26e66d09bf394ae5a739627a1dc8b7cae6f4 (patch) | |
| tree | f03743d576a0c7826b9921ad47e70370ebe80a22 /kernel/trace/trace.h | |
| parent | ec83db0f78cd44c3b586ec1c3a348d1a8a389797 (diff) | |
| parent | 73eff9f56e15598c8399c0b86899fd889b97f085 (diff) | |
| download | olio-linux-3.10-9cba26e66d09bf394ae5a739627a1dc8b7cae6f4.tar.xz olio-linux-3.10-9cba26e66d09bf394ae5a739627a1dc8b7cae6f4.zip | |
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.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 1bcdbec95a1..a7d28e033a9 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -136,6 +136,7 @@ struct trace_array_cpu { atomic_t disabled; void *buffer_page; /* ring buffer spare */ + unsigned long entries; unsigned long saved_latency; unsigned long critical_start; unsigned long critical_end; @@ -157,7 +158,6 @@ struct trace_array_cpu { */ struct trace_array { struct ring_buffer *buffer; - unsigned long entries; int cpu; int buffer_disabled; cycle_t time_start; @@ -831,6 +831,8 @@ extern struct list_head ftrace_events; extern const char *__start___trace_bprintk_fmt[]; extern const char *__stop___trace_bprintk_fmt[]; +void trace_printk_init_buffers(void); + #undef FTRACE_ENTRY #define FTRACE_ENTRY(call, struct_name, id, tstruct, print, filter) \ extern struct ftrace_event_call \ |