From: zhangwei(Jovi) Date: Thu, 18 Jul 2013 08:31:18 +0000 (+0800) Subject: tracing: Add TRACE_ITER_PRINTK flag check in __trace_puts/__trace_bputs X-Git-Tag: upstream/snapshot3+hdmi~2054 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git;a=commitdiff_plain;h=985615b27de9a693d8015d1bfe32d35b24133b9c tracing: Add TRACE_ITER_PRINTK flag check in __trace_puts/__trace_bputs commit f0160a5a2912267c02cfe692eac955c360de5fdf upstream. The TRACE_ITER_PRINTK check in __trace_puts/__trace_bputs is missing, so add it, to be consistent with __trace_printk/__trace_bprintk. Those functions are all called by the same function: trace_printk(). Link: http://lkml.kernel.org/p/51E7A7D6.8090900@huawei.com Signed-off-by: zhangwei(Jovi) Signed-off-by: Steven Rostedt Signed-off-by: Greg Kroah-Hartman --- diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index c076164..7e259b2 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -456,6 +456,9 @@ int __trace_puts(unsigned long ip, const char *str, int size) int alloc; int pc; + if (!(trace_flags & TRACE_ITER_PRINTK)) + return 0; + pc = preempt_count(); if (unlikely(tracing_selftest_running || tracing_disabled)) @@ -503,6 +506,9 @@ int __trace_bputs(unsigned long ip, const char *str) int size = sizeof(struct bputs_entry); int pc; + if (!(trace_flags & TRACE_ITER_PRINTK)) + return 0; + pc = preempt_count(); if (unlikely(tracing_selftest_running || tracing_disabled))