summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJovi Zhang <bookjovi@gmail.com>2013-01-25 18:03:07 +0800
committerSteven Rostedt <rostedt@goodmis.org>2013-01-29 09:57:49 -0500
commit38dbe0b137bfe6ea92be495017885c0785179a02 (patch)
tree4e2fab939fd6a8feb1f2a0de7c8e58f11f64c799 /kernel
parent821465295b36136998ef294fe176fba4e09c1cd9 (diff)
downloadop-kernel-dev-38dbe0b137bfe6ea92be495017885c0785179a02.zip
op-kernel-dev-38dbe0b137bfe6ea92be495017885c0785179a02.tar.gz
tracing: Remove second iterator initializer
The trace iterator is already initialized by trace_init_global_iter(), so there is no need to initialize it again. Link: http://lkml.kernel.org/r/CACV3sb+G1YnO6168JhY3dEadmJi58pA5-2cSZT8E0WVHJNFt9Q@mail.gmail.com Signed-off-by: Jovi Zhang <bookjovi@gmail.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 07888e1..d399592 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -5030,6 +5030,7 @@ __ftrace_dump(bool disable_tracing, enum ftrace_dump_mode oops_dump_mode)
if (disable_tracing)
ftrace_kill();
+ /* Simulate the iterator */
trace_init_global_iter(&iter);
for_each_tracing_cpu(cpu) {
@@ -5041,10 +5042,6 @@ __ftrace_dump(bool disable_tracing, enum ftrace_dump_mode oops_dump_mode)
/* don't look at user memory in panic mode */
trace_flags &= ~TRACE_ITER_SYM_USEROBJ;
- /* Simulate the iterator */
- iter.tr = &global_trace;
- iter.trace = current_trace;
-
switch (oops_dump_mode) {
case DUMP_ALL:
iter.cpu_file = TRACE_PIPE_ALL_CPU;
OpenPOWER on IntegriCloud