---

yaml --- r: 350039 b: refs/heads/master c: 38dbe0b h: refs/heads/master i: 350037: b6cd63d 350035: 42f9341 350031: cb58863 v: v3
git-mirror · Jan 29, 2013 · 1332000 · 1332000
1 parent 9f40215
commit 1332000
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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;