Merge branch 'drm-next' of ../drm-next into drm-linus

[~andy/linux] / kernel / trace / trace_functions.c

diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c
index 5b01b94518fcf15cc36646b6d2b859ed64a072e6..b3f3776b0cd64002605f6c3d2f2dc9528f2b9932 100644 (file)
--- a/kernel/trace/trace_functions.c
+++ b/kernel/trace/trace_functions.c
@@ -290,7 +290,7 @@ ftrace_trace_onoff_print(struct seq_file *m, unsigned long ip,
 {
        long count = (long)data;
 
-       seq_printf(m, "%pf:", (void *)ip);
+       seq_printf(m, "%ps:", (void *)ip);
 
        if (ops == &traceon_probe_ops)
                seq_printf(m, "traceon");