[PATCH][GIT PULL] for tip/tracing/ftrace

[Steven Rostedt]

Ingo,

Please pull the latest tip/tracing/ftrace tree, which can be found at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/tracing/ftrace


Steven Rostedt (1):
      tracing: add cpu_file intialization for ftrace_dump

----
 kernel/trace/trace.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---------------------------
commit e543ad76914abec1acf6631604a4154cd7a2ca6b
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date:   Wed Mar 4 18:20:36 2009 -0500

    tracing: add cpu_file intialization for ftrace_dump
    
    Impact: fix to ftrace_dump output corruption
    
    The commit: b04cc6b1f6398b0e0b60d37e27ce51b4899672ec
      tracing/core: introduce per cpu tracing files
    
    added a new field to the iterator called cpu_file. This was a handle
    to differentiate between the per cpu trace output files and the
    all cpu "trace" file. The all cpu "trace" file required setting this
    to TRACE_PIPE_ALL_CPU.
    
    The problem is that the ftrace_dump sets up its own iterator but was
    not updated to handle this change. The result was only CPU 0 printing
    out on crash and a lot of "<0>"'s also being printed.
    
    Reported-by: Thomas Gleixner <tglx@xxxxxxxxxxxxxx>
    Tested-by: Darren Hart <dvhtc@xxxxxxxxxx>
    Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index c8abbb0..ab5cbca 100644
--- a/kernel/trace/trace.c
+++ b/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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/