diff options
author | Jovi Zhang <bookjovi@gmail.com> | 2013-01-25 05:03:07 -0500 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2013-01-29 09:57:49 -0500 |
commit | 38dbe0b137bfe6ea92be495017885c0785179a02 (patch) | |
tree | 4e2fab939fd6a8feb1f2a0de7c8e58f11f64c799 /kernel/trace/trace.c | |
parent | 821465295b36136998ef294fe176fba4e09c1cd9 (diff) |
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/trace/trace.c')
-rw-r--r-- | kernel/trace/trace.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 07888e15c694..d399592701aa 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) | |||
5030 | if (disable_tracing) | 5030 | if (disable_tracing) |
5031 | ftrace_kill(); | 5031 | ftrace_kill(); |
5032 | 5032 | ||
5033 | /* Simulate the iterator */ | ||
5033 | trace_init_global_iter(&iter); | 5034 | trace_init_global_iter(&iter); |
5034 | 5035 | ||
5035 | for_each_tracing_cpu(cpu) { | 5036 | for_each_tracing_cpu(cpu) { |
@@ -5041,10 +5042,6 @@ __ftrace_dump(bool disable_tracing, enum ftrace_dump_mode oops_dump_mode) | |||
5041 | /* don't look at user memory in panic mode */ | 5042 | /* don't look at user memory in panic mode */ |
5042 | trace_flags &= ~TRACE_ITER_SYM_USEROBJ; | 5043 | trace_flags &= ~TRACE_ITER_SYM_USEROBJ; |
5043 | 5044 | ||
5044 | /* Simulate the iterator */ | ||
5045 | iter.tr = &global_trace; | ||
5046 | iter.trace = current_trace; | ||
5047 | |||
5048 | switch (oops_dump_mode) { | 5045 | switch (oops_dump_mode) { |
5049 | case DUMP_ALL: | 5046 | case DUMP_ALL: |
5050 | iter.cpu_file = TRACE_PIPE_ALL_CPU; | 5047 | iter.cpu_file = TRACE_PIPE_ALL_CPU; |