summaryrefslogtreecommitdiff
path: root/arch/c6x/kernel
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.com>2018-01-22 10:40:50 +0100
committerPetr Mladek <pmladek@suse.com>2018-01-22 10:40:50 +0100
commit51ccbb0ae865e153c43117e6c3244fa373ea6bd6 (patch)
tree4bfa54ad5ec0542f24627971d937166960c32723 /arch/c6x/kernel
parent3ccdc5190f8df12dfafff9264e406c5496401da5 (diff)
parentd2279c9d7f7db7f97567368bfc4539b3411adf8d (diff)
Merge branch 'for-4.16-print-symbol' into for-4.16
Diffstat (limited to 'arch/c6x/kernel')
-rw-r--r--arch/c6x/kernel/traps.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/c6x/kernel/traps.c b/arch/c6x/kernel/traps.c
index 09b8a40d5680..4c1d4b84dd2b 100644
--- a/arch/c6x/kernel/traps.c
+++ b/arch/c6x/kernel/traps.c
@@ -11,7 +11,6 @@
#include <linux/module.h>
#include <linux/ptrace.h>
#include <linux/sched/debug.h>
-#include <linux/kallsyms.h>
#include <linux/bug.h>
#include <asm/soc.h>
@@ -375,8 +374,7 @@ static void show_trace(unsigned long *stack, unsigned long *endstack)
if (i % 5 == 0)
pr_debug("\n ");
#endif
- pr_debug(" [<%08lx>]", addr);
- print_symbol(" %s\n", addr);
+ pr_debug(" [<%08lx>] %pS\n", addr, (void *)addr);
i++;
}
}