Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fbbae65 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files

m68k: Use new printk() extension %pS to print symbols 



This changes the oops and backtrace code to use the new `%pS' printk()
extension to print out symbols rather than manually calling print_symbol.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5b1d5f95

arch/m68k/kernel/traps.c

+3 −6
Original line number Diff line number Diff line
@@ -883,8 +883,7 @@ void show_trace(unsigned long *stack) 
			if (i % 5 == 0)

				printk("\n       ");

#endif

			printk(" [<%08lx>]", addr);

			print_symbol(" %s\n", addr);

			printk(" [<%08lx>] %pS\n", addr, (void *)addr);

			i++;

		}

	}
@@ -900,10 +899,8 @@ void show_registers(struct pt_regs *regs) 
	int i;



	print_modules();

	printk("PC: [<%08lx>]",regs->pc);

	print_symbol(" %s", regs->pc);

	printk("\nSR: %04x  SP: %p  a2: %08lx\n",

	       regs->sr, regs, regs->a2);

	printk("PC: [<%08lx>] %pS\n", regs->pc, (void *)regs->pc);

	printk("SR: %04x  SP: %p  a2: %08lx\n", regs->sr, regs, regs->a2);

	printk("d0: %08lx    d1: %08lx    d2: %08lx    d3: %08lx\n",

	       regs->d0, regs->d1, regs->d2, regs->d3);

	printk("d4: %08lx    d5: %08lx    a0: %08lx    a1: %08lx\n",