summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2013-05-29 21:56:49 +0200
committerSteven Rostedt <rostedt@goodmis.org>2013-05-29 22:00:03 +0200
commit0184d50f9fd17658c232d6ee6d465a87f989d706 (patch)
treefdf81c6309458bf0a2a1af17115c42a2270889a9 /kernel
parentftrace: Use the rcu _notrace variants for rcu_dereference_raw() and friends (diff)
downloadlinux-0184d50f9fd17658c232d6ee6d465a87f989d706.tar.xz
linux-0184d50f9fd17658c232d6ee6d465a87f989d706.zip
tracing: Fix bad parameter passed in branch selftest
The branch selftest calls trace_test_buffer(), but with the new code it expects the first parameter to be a pointer to a struct trace_buffer. All self tests were changed but the branch selftest was missed. This caused either a crash or failed test when the branch selftest was enabled. Link: http://lkml.kernel.org/r/20130529141333.GA24064@localhost Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace_selftest.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c
index 55e2cf66967b..2901e3b88590 100644
--- a/kernel/trace/trace_selftest.c
+++ b/kernel/trace/trace_selftest.c
@@ -1159,7 +1159,7 @@ trace_selftest_startup_branch(struct tracer *trace, struct trace_array *tr)
/* stop the tracing. */
tracing_stop();
/* check the trace buffer */
- ret = trace_test_buffer(tr, &count);
+ ret = trace_test_buffer(&tr->trace_buffer, &count);
trace->reset(tr);
tracing_start();