diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-06-13 11:59:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-06-13 11:59:42 +0200 |
| commit | afbee42706090fa59dac299c9607e4fd4361ec82 (patch) | |
| tree | fb9c0c13fdbbbd8ff5f2d85e8f351bb3d487b821 | |
| parent | Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/o... (diff) | |
| parent | tracing: Fix regression in printk_formats file (diff) | |
| download | linux-afbee42706090fa59dac299c9607e4fd4361ec82.tar.xz linux-afbee42706090fa59dac299c9607e4fd4361ec82.zip | |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
| -rw-r--r-- | kernel/trace/trace_printk.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/trace/trace_printk.c b/kernel/trace/trace_printk.c index dff763b7baf1..1f06468a10d7 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); } |