diff --git a/[refs] b/[refs]
index ebc3c7b05702..60de47e828c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05fdd70d2fe1e34d8b80ec56d6e3272d9293653e
+refs/heads/master: a591c73f127505cdbd0aa399a92112a8ddff8730
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 08a08bab57a3..a44d4c6ca9a8 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/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