From 1332000d161a6f67fd77f23d22292a5206052b9b Mon Sep 17 00:00:00 2001
From: Jovi Zhang <bookjovi@gmail.com>
Date: Fri, 25 Jan 2013 18:03:07 +0800
Subject: [PATCH] --- yaml --- r: 350039 b: refs/heads/master c:
 38dbe0b137bfe6ea92be495017885c0785179a02 h: refs/heads/master i:   350037:
 b6cd63d3fb66d192003bc5df6cc091f0b8c7b68a   350035:
 42f9341eff5854da6d63df411008be4950e7d342   350031:
 cb58863c9dea47a186d2cf0bad32215fefabda81 v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/trace/trace.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 89a3a5f28d17..e4ee87d02f79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 821465295b36136998ef294fe176fba4e09c1cd9
+refs/heads/master: 38dbe0b137bfe6ea92be495017885c0785179a02
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 07888e15c694..d399592701aa 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/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;