Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757571Ab2EUJqF (ORCPT ); Mon, 21 May 2012 05:46:05 -0400 Received: from terminus.zytor.com ([198.137.202.10]:39057 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756966Ab2EUJqD (ORCPT ); Mon, 21 May 2012 05:46:03 -0400 Date: Mon, 21 May 2012 02:45:43 -0700 From: tip-bot for Vaibhav Nagarnaik Message-ID: Cc: mingo@redhat.com, linux-kernel@vger.kernel.org, vnagarnaik@google.com, hpa@zytor.com, mingo@kernel.org, dhsharp@google.com, fweisbec@gmail.com, rostedt@goodmis.org, chavey@google.com, tglx@linutronix.de, teravest@google.com Reply-To: mingo@kernel.org, hpa@zytor.com, vnagarnaik@google.com, linux-kernel@vger.kernel.org, mingo@redhat.com, dhsharp@google.com, fweisbec@gmail.com, rostedt@goodmis.org, chavey@google.com, tglx@linutronix.de, teravest@google.com In-Reply-To: <1336066834-1673-1-git-send-email-vnagarnaik@google.com> References: <1336066834-1673-1-git-send-email-vnagarnaik@google.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tracing: Fix initial buffer_size_kb state Git-Commit-ID: a591c73f127505cdbd0aa399a92112a8ddff8730 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.6 (terminus.zytor.com [127.0.0.1]); Mon, 21 May 2012 02:45:48 -0700 (PDT) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1678 Lines: 44 Commit-ID: a591c73f127505cdbd0aa399a92112a8ddff8730 Gitweb: http://git.kernel.org/tip/a591c73f127505cdbd0aa399a92112a8ddff8730 Author: Vaibhav Nagarnaik AuthorDate: Thu, 3 May 2012 10:40:34 -0700 Committer: Steven Rostedt CommitDate: Sat, 19 May 2012 08:28:50 -0400 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 Cc: Ingo Molnar Cc: Laurent Chavey Cc: Justin Teravest Cc: David Sharp Signed-off-by: Vaibhav Nagarnaik Signed-off-by: Steven Rostedt --- 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 08a08ba..a44d4c6 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/