Commit f0160a5a authored Jul 18, 2013 by zhangwei(Jovi) Committed by Steven Rostedt Jul 15, 2014

tracing: Add TRACE_ITER_PRINTK flag check in __trace_puts/__trace_bputs

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



Cc: stable@vger.kernel.org # 3.11+
Signed-off-by: zhangwei(Jovi) <jovi.zhangwei@huawei.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

parent 5f8bf2d2

kernel/trace/trace.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -468,6 +468,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))
		@@ -515,6 +518,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))

Admin message