22 Mar
2018
22 Mar
'18
2:37 p.m.
On Wed, 21 Mar 2018 15:09:32 -0700 Joe Perches joe@perches.com wrote:
diff --git a/kernel/trace/trace_printk.c b/kernel/trace/trace_printk.c index ad1d6164e946..50f44b7b2b32 100644 --- a/kernel/trace/trace_printk.c +++ b/kernel/trace/trace_printk.c @@ -196,7 +196,7 @@ struct notifier_block module_trace_bprintk_format_nb = { };
int __trace_bprintk(unsigned long ip, const char *fmt, ...)
- {
+{ int ret; va_list ap;
@@ -214,7 +214,7 @@ int __trace_bprintk(unsigned long ip, const char *fmt, ...) EXPORT_SYMBOL_GPL(__trace_bprintk);
int __ftrace_vbprintk(unsigned long ip, const char *fmt, va_list ap)
- {
+{ if (unlikely(!fmt)) return 0;
Acked-by: Steven Rostedt (VMware) rostedt@goodmis.org
-- Steve