summaryrefslogtreecommitdiff
path: root/kernel/trace/trace_printk.c
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-04-13 12:02:21 +0800
committerAlex Shi <alex.shi@linaro.org>2016-04-13 12:02:21 +0800
commit08562bfcb85748c69e5824fc6d1d77d5725787e4 (patch)
tree905e39ccad43e244dbb09d4eccce1c91e0facce0 /kernel/trace/trace_printk.c
parent9fe9bdd75b2ad9ed25152fce02f41fe63c542e8a (diff)
parentad592b70ae97800d4f5bf535d45a680649e2789e (diff)
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'kernel/trace/trace_printk.c')
-rw-r--r--kernel/trace/trace_printk.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/trace/trace_printk.c b/kernel/trace/trace_printk.c
index 060df67dbdd1..f96f0383f6c6 100644
--- a/kernel/trace/trace_printk.c
+++ b/kernel/trace/trace_printk.c
@@ -296,6 +296,9 @@ static int t_show(struct seq_file *m, void *v)
const char *str = *fmt;
int i;
+ if (!*fmt)
+ return 0;
+
seq_printf(m, "0x%lx : \"", *(unsigned long *)fmt);
/*