diff options
| author | Vaibhav Nagarnaik <vnagarnaik@google.com> | 2012-05-03 10:40:34 -0700 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-05-19 08:28:50 -0400 |
| commit | a591c73f127505cdbd0aa399a92112a8ddff8730 (patch) | |
| tree | 47eeb200977b79ddfbe3a6a26e8e38dc93bb5ff5 /kernel | |
| parent | 05fdd70d2fe1e34d8b80ec56d6e3272d9293653e (diff) | |
| download | linux-stable-a591c73f127505cdbd0aa399a92112a8ddff8730.tar.gz linux-stable-a591c73f127505cdbd0aa399a92112a8ddff8730.tar.bz2 linux-stable-a591c73f127505cdbd0aa399a92112a8ddff8730.zip | |
tracing: Fix initial buffer_size_kb state
Make sure that the state of buffer_size_kb is initialized correctly and
returns actual size of the ring buffer.
Link: http://lkml.kernel.org/r/1336066834-1673-1-git-send-email-vnagarnaik@google.com
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Laurent Chavey <chavey@google.com>
Cc: Justin Teravest <teravest@google.com>
Cc: David Sharp <dhsharp@google.com>
Signed-off-by: Vaibhav Nagarnaik <vnagarnaik@google.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 08a08bab57a3..a44d4c6ca9a8 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -5112,7 +5112,8 @@ __init static int tracer_alloc_buffers(void) max_tr.data[i] = &per_cpu(max_tr_data, i); } - set_buffer_entries(&global_trace, ring_buf_size); + set_buffer_entries(&global_trace, + ring_buffer_size(global_trace.buffer, 0)); #ifdef CONFIG_TRACER_MAX_TRACE set_buffer_entries(&max_tr, 1); #endif |