Skip to content
Snippets Groups Projects
Commit 833f83c6 authored by Ecco Park's avatar Ecco Park
Browse files

Merge branch 'android-msm-marlin-3.18-nyc-mr2-security-next' into android-msm-marlin-3.18-nyc-mr2 

May 2017.2

Bug: 36137719
parents d6bd3981 08546913
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
kernel/trace/trace_printk.c
+ 1
− 1
View file @ 833f83c6
......@@ -294,7 +294,7 @@ static int t_show(struct seq_file *m, void *v)
if (!*fmt)
return 0;
seq_printf(m, "0x%lx : \"", *(unsigned long *)fmt);
seq_printf(m, "0x%lx : \"", 0L);
/*
* Tabs and new lines need to be converted.
......
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment