From: Jovi Zhang <[email protected]>

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-2cszt8e0wvhjnf...@mail.gmail.com

Signed-off-by: Jovi Zhang <[email protected]>
Signed-off-by: Steven Rostedt <[email protected]>
---
 kernel/trace/trace.c |    5 +----
 1 file changed, 1 insertion(+), 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;
-- 
1.7.10.4


Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to