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 75ef000613c35db5c7cb8ae71b2f4169f0bfd6d8..b3f3776b0cd64002605f6c3d2f2dc9528f2b9932 100644 (file)
--- a/kernel/trace/trace_functions.c
+++ b/kernel/trace/trace_functions.c
@@ -288,11 +288,9 @@ static int
 ftrace_trace_onoff_print(struct seq_file *m, unsigned long ip,
                         struct ftrace_probe_ops *ops, void *data)
 {
-       char str[KSYM_SYMBOL_LEN];
        long count = (long)data;
 
-       kallsyms_lookup(ip, NULL, NULL, NULL, str);
-       seq_printf(m, "%s:", str);
+       seq_printf(m, "%ps:", (void *)ip);
 
        if (ops == &traceon_probe_ops)
                seq_printf(m, "traceon");