[PATCH][GIT PULL][v3.0] tracing: Fix regression in printk_formats file

[PATCH][GIT PULL][v3.0] tracing: Fix regression in printk_formats file

[Steven Rostedt]

Ingo,

Please pull the latest tip/perf/urgent tree, which can be found at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/perf/urgent

Head SHA1: db5e7ecc4abc91b9f26f0c0d79ef88a51e987d90


Steven Rostedt (1):
      tracing: Fix regression in printk_formats file

----
 kernel/trace/trace_printk.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---------------------------
commit db5e7ecc4abc91b9f26f0c0d79ef88a51e987d90
Author: Steven Rostedt <srostedt@redhat.com>
Date:   Thu Jun 9 08:40:59 2011 -0400

    tracing: Fix regression in printk_formats file
    
    The fix to fix the printk_formats of modules broke the
    printk_formats of trace_printks in the kernel.
    
    The update of what to show via the seq_file was only updated
    if the passed in fmt was NULL, which happens only on the first
    iteration. The result was showing the first format every time
    instead of iterating through the available formats.
    
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/kernel/trace/trace_printk.c b/kernel/trace/trace_printk.c
index dff763b..1f06468 100644
--- a/kernel/trace/trace_printk.c
+++ b/kernel/trace/trace_printk.c
@@ -240,13 +240,10 @@ static const char **find_next(void *v, loff_t *pos)
 	const char **fmt = v;
 	int start_index;
 
-	if (!fmt)
-		fmt = __start___trace_bprintk_fmt + *pos;
-
 	start_index = __stop___trace_bprintk_fmt - __start___trace_bprintk_fmt;
 
 	if (*pos < start_index)
-		return fmt;
+		return __start___trace_bprintk_fmt + *pos;
 
 	return find_next_mod_format(start_index, v, fmt, pos);
 }

Re: [PATCH][GIT PULL][v3.0] tracing: Fix regression in printk_formats file

[Ingo Molnar]

* Steven Rostedt <rostedt@goodmis.org> wrote:

> 
> Ingo,
> 
> Please pull the latest tip/perf/urgent tree, which can be found at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
> tip/perf/urgent
> 
> Head SHA1: db5e7ecc4abc91b9f26f0c0d79ef88a51e987d90
> 
> 
> Steven Rostedt (1):
>       tracing: Fix regression in printk_formats file
> 
> ----
>  kernel/trace/trace_printk.c |    5 +----
>  1 files changed, 1 insertions(+), 4 deletions(-)

Pulled, thanks Steve!

	Ingo