linux-kernel - [tip:perf/core] tracing: Fix initial buffer_size

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-a591c73f127505cdbd0aa399a92112a8ddff8730@git.kernel.org>
Date:	Mon, 21 May 2012 02:45:43 -0700
From:	tip-bot for Vaibhav Nagarnaik <vnagarnaik@...gle.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	mingo@...hat.com, linux-kernel@...r.kernel.org,
	vnagarnaik@...gle.com, hpa@...or.com, mingo@...nel.org,
	dhsharp@...gle.com, fweisbec@...il.com, rostedt@...dmis.org,
	chavey@...gle.com, tglx@...utronix.de, teravest@...gle.com
Subject: [tip:perf/core] tracing: Fix initial buffer_size_kb state

Commit-ID:  a591c73f127505cdbd0aa399a92112a8ddff8730
Gitweb:     http://git.kernel.org/tip/a591c73f127505cdbd0aa399a92112a8ddff8730
Author:     Vaibhav Nagarnaik <vnagarnaik@...gle.com>
AuthorDate: Thu, 3 May 2012 10:40:34 -0700
Committer:  Steven Rostedt <rostedt@...dmis.org>
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 <fweisbec@...il.com>
Cc: Ingo Molnar <mingo@...hat.com>
Cc: Laurent Chavey <chavey@...gle.com>
Cc: Justin Teravest <teravest@...gle.com>
Cc: David Sharp <dhsharp@...gle.com>
Signed-off-by: Vaibhav Nagarnaik <vnagarnaik@...gle.com>
Signed-off-by: Steven Rostedt <rostedt@...dmis.org>
---
 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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/