tracing: Expand ring buffer when trace_printk() is used

[linux-2.6-microblaze.git] / kernel / trace / trace.c

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 36c213f..a5411b7 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1571,6 +1571,9 @@ void trace_printk_init_buffers(void)
 
        pr_info("ftrace: Allocated trace_printk buffers\n");
 
+       /* Expand the buffers to set size */
+       tracing_update_buffers();
+
        buffers_allocated = 1;
 }
 
@@ -3030,6 +3033,10 @@ static int __tracing_resize_ring_buffer(unsigned long size, int cpu)
         */
        ring_buffer_expanded = 1;
 
+       /* May be called before buffers are initialized */
+       if (!global_trace.buffer)
+               return 0;
+
        ret = ring_buffer_resize(global_trace.buffer, size, cpu);
        if (ret < 0)
                return ret;