commit afbee42706090fa59dac299c9607e4fd4361ec82
author Ingo Molnar <mingo@elte.hu> Mon Jun 13 11:59:42 2011 +0200
committer Ingo Molnar <mingo@elte.hu> Mon Jun 13 11:59:42 2011 +0200
tree fb9c0c13fdbbbd8ff5f2d85e8f351bb3d487b821
parent 5f127133ee432d0b83ee26e8e3a3d7828ab5f2b1
parent db5e7ecc4abc91b9f26f0c0d79ef88a51e987d90

Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent

kernel/trace/trace_printk.c

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 @@
 	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);
 }