diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-20 16:39:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-20 16:39:47 -0800 |
| commit | 937b5b5ddd2f685b4962ec19502e641bb5741c12 (patch) | |
| tree | d102ea662d46f4485ac8b04f7b23551112a50efc /arch/m68k/kernel/process.c | |
| parent | c945d0227d86ddc3485290fa5da1a7d2c9b759de (diff) | |
| parent | 3dfe33020ca8a5e4f72993cc792a4838c464c8b3 (diff) | |
| download | linux-stable-937b5b5ddd2f685b4962ec19502e641bb5741c12.tar.gz linux-stable-937b5b5ddd2f685b4962ec19502e641bb5741c12.tar.bz2 linux-stable-937b5b5ddd2f685b4962ec19502e641bb5741c12.zip | |
Merge tag 'm68k-for-v4.11-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- kernel message modernizations and cleanups
- defconfig updates
- cleanups
* tag 'm68k-for-v4.11-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k/sun3: Remove dead code in paging_init()
m68k/include: Modernize printing of kernel messages
m68k/mm: Modernize printing of kernel messages
m68k/mm: sun3 - Modernize printing of kernel messages
m68k/kernel: Modernize printing of kernel messages
m68k/sun3x: Modernize printing of kernel messages
m68k/sun3: Modernize printing of kernel messages
m68k/q40: Modernize printing of kernel messages
m68k/mvme16x: Modernize printing of kernel messages
m68k/mvme147: Modernize printing of kernel messages
m68k/bvme6000: Modernize printing of kernel messages
m68k/68000: Modernize printing of kernel messages
m68k/atari: Modernize printing of kernel messages
m68k: Delete an unnecessary variable assignment in sys_cacheflush()
m68k/mac: Clean up interrupt debug macros and printk statements
m68k/mac: Remove SHUTUP_SONIC interrupt hack
m68k/mac: Improve NMI handler
m68k/defconfig: Update defconfigs for v4.10-rc1
m68k/mac: Remove unneeded linux/miscdevice.h include
Diffstat (limited to 'arch/m68k/kernel/process.c')
| -rw-r--r-- | arch/m68k/kernel/process.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c index aaf28f8e342d..f0a8e9b332cd 100644 --- a/arch/m68k/kernel/process.c +++ b/arch/m68k/kernel/process.c @@ -87,17 +87,17 @@ EXPORT_SYMBOL(pm_power_off); void show_regs(struct pt_regs * regs) { - printk("\n"); - printk("Format %02x Vector: %04x PC: %08lx Status: %04x %s\n", - regs->format, regs->vector, regs->pc, regs->sr, print_tainted()); - printk("ORIG_D0: %08lx D0: %08lx A2: %08lx A1: %08lx\n", - regs->orig_d0, regs->d0, regs->a2, regs->a1); - printk("A0: %08lx D5: %08lx D4: %08lx\n", - regs->a0, regs->d5, regs->d4); - printk("D3: %08lx D2: %08lx D1: %08lx\n", - regs->d3, regs->d2, regs->d1); + pr_info("Format %02x Vector: %04x PC: %08lx Status: %04x %s\n", + regs->format, regs->vector, regs->pc, regs->sr, + print_tainted()); + pr_info("ORIG_D0: %08lx D0: %08lx A2: %08lx A1: %08lx\n", + regs->orig_d0, regs->d0, regs->a2, regs->a1); + pr_info("A0: %08lx D5: %08lx D4: %08lx\n", regs->a0, regs->d5, + regs->d4); + pr_info("D3: %08lx D2: %08lx D1: %08lx\n", regs->d3, regs->d2, + regs->d1); if (!(regs->sr & PS_S)) - printk("USP: %08lx\n", rdusp()); + pr_info("USP: %08lx\n", rdusp()); } void flush_thread(void) |