From 008cc42830cfb063f3fe8644ad99e4073f7fb0d8 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Wed, 9 Mar 2011 20:09:26 -0500 Subject: [PATCH] --- yaml --- r: 234530 b: refs/heads/master c: 4a0b1665db09cf2da9ad7d0f12da386373c10bfa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 814d02c2c194..82129a7113ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a24470b2826e4665b1484836c7ae6aba1ddea32 +refs/heads/master: 4a0b1665db09cf2da9ad7d0f12da386373c10bfa diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index fd6e1b906b3c..9541c27c1cf2 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -779,6 +779,11 @@ __acquires(kernel_lock) tracing_reset_online_cpus(tr); current_trace = type; + + /* If we expanded the buffers, make sure the max is expanded too */ + if (ring_buffer_expanded && type->use_max_tr) + ring_buffer_resize(max_tr.buffer, trace_buf_size); + /* the test is responsible for initializing and enabling */ pr_info("Testing tracer %s: ", type->name); ret = type->selftest(type, tr); @@ -791,6 +796,10 @@ __acquires(kernel_lock) /* Only reset on passing, to avoid touching corrupted buffers */ tracing_reset_online_cpus(tr); + /* Shrink the max buffer again */ + if (ring_buffer_expanded && type->use_max_tr) + ring_buffer_resize(max_tr.buffer, 1); + printk(KERN_CONT "PASSED\n"); } #endif