diff --git a/[refs] b/[refs]
index 6d05ee108f45..fd69b79518a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4ef144a9d0803eb0a2d4110ae87e7f34e667ded
+refs/heads/master: e543ad76914abec1acf6631604a4154cd7a2ca6b
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index c8abbb0c8397..ab5cbcae43a1 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -3918,8 +3918,10 @@ void ftrace_dump(void)
 
 	printk(KERN_TRACE "Dumping ftrace buffer:\n");
 
+	/* Simulate the iterator */
 	iter.tr = &global_trace;
 	iter.trace = current_trace;
+	iter.cpu_file = TRACE_PIPE_ALL_CPU;
 
 	/*
 	 * We need to stop all tracing on all CPUS to read the