Merge branch 'signal-for-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git...

[uclinux-h8/linux.git] / arch / arm / kernel / traps.c

diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index b4bd2e5..da04ed8 100644 (file)
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -67,12 +67,14 @@ void dump_backtrace_entry(unsigned long where, unsigned long from,
 {
        unsigned long end = frame + 4 + sizeof(struct pt_regs);
 
-#ifdef CONFIG_KALLSYMS
+#ifndef CONFIG_KALLSYMS
+       printk("%sFunction entered at [<%08lx>] from [<%08lx>]\n",
+               loglvl, where, from);
+#elif defined CONFIG_BACKTRACE_VERBOSE
        printk("%s[<%08lx>] (%ps) from [<%08lx>] (%pS)\n",
                loglvl, where, (void *)where, from, (void *)from);
 #else
-       printk("%sFunction entered at [<%08lx>] from [<%08lx>]\n",
-               loglvl, where, from);
+       printk("%s %ps from %pS\n", loglvl, (void *)where, (void *)from);
 #endif
 
        if (in_entry_text(from) && end <= ALIGN(frame, THREAD_SIZE))