aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/mips/kernel/mips-mt.c11
-rw-r--r--arch/mips/kernel/traps.c8
-rw-r--r--arch/mips/sgi-ip27/ip27-nmi.c10
3 files changed, 12 insertions, 17 deletions
diff --git a/arch/mips/kernel/mips-mt.c b/arch/mips/kernel/mips-mt.c
index 640fb0cc6e39..d01665a453f5 100644
--- a/arch/mips/kernel/mips-mt.c
+++ b/arch/mips/kernel/mips-mt.c
@@ -4,7 +4,6 @@
4 */ 4 */
5 5
6#include <linux/device.h> 6#include <linux/device.h>
7#include <linux/kallsyms.h>
8#include <linux/kernel.h> 7#include <linux/kernel.h>
9#include <linux/sched.h> 8#include <linux/sched.h>
10#include <linux/module.h> 9#include <linux/module.h>
@@ -84,9 +83,9 @@ void mips_mt_regdump(unsigned long mvpctl)
84 read_vpe_c0_vpeconf0()); 83 read_vpe_c0_vpeconf0());
85 printk(" VPE%d.Status : %08lx\n", 84 printk(" VPE%d.Status : %08lx\n",
86 i, read_vpe_c0_status()); 85 i, read_vpe_c0_status());
87 printk(" VPE%d.EPC : %08lx ", 86 printk(" VPE%d.EPC : %08lx %pS\n",
88 i, read_vpe_c0_epc()); 87 i, read_vpe_c0_epc(),
89 print_symbol("%s\n", read_vpe_c0_epc()); 88 (void *) read_vpe_c0_epc());
90 printk(" VPE%d.Cause : %08lx\n", 89 printk(" VPE%d.Cause : %08lx\n",
91 i, read_vpe_c0_cause()); 90 i, read_vpe_c0_cause());
92 printk(" VPE%d.Config7 : %08lx\n", 91 printk(" VPE%d.Config7 : %08lx\n",
@@ -111,8 +110,8 @@ void mips_mt_regdump(unsigned long mvpctl)
111 } 110 }
112 printk(" TCStatus : %08lx\n", tcstatval); 111 printk(" TCStatus : %08lx\n", tcstatval);
113 printk(" TCBind : %08lx\n", read_tc_c0_tcbind()); 112 printk(" TCBind : %08lx\n", read_tc_c0_tcbind());
114 printk(" TCRestart : %08lx ", read_tc_c0_tcrestart()); 113 printk(" TCRestart : %08lx %pS\n",
115 print_symbol("%s\n", read_tc_c0_tcrestart()); 114 read_tc_c0_tcrestart(), (void *) read_tc_c0_tcrestart());
116 printk(" TCHalt : %08lx\n", haltval); 115 printk(" TCHalt : %08lx\n", haltval);
117 printk(" TCContext : %08lx\n", read_tc_c0_tccontext()); 116 printk(" TCContext : %08lx\n", read_tc_c0_tccontext());
118 if (!haltval) 117 if (!haltval)
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 6e7e4a2775f6..b8ea4e9d0d87 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -248,11 +248,11 @@ static void __show_regs(const struct pt_regs *regs)
248 /* 248 /*
249 * Saved cp0 registers 249 * Saved cp0 registers
250 */ 250 */
251 printk("epc : %0*lx ", field, regs->cp0_epc); 251 printk("epc : %0*lx %pS\n", field, regs->cp0_epc,
252 print_symbol("%s ", regs->cp0_epc); 252 (void *) regs->cp0_epc);
253 printk(" %s\n", print_tainted()); 253 printk(" %s\n", print_tainted());
254 printk("ra : %0*lx ", field, regs->regs[31]); 254 printk("ra : %0*lx %pS\n", field, regs->regs[31],
255 print_symbol("%s\n", regs->regs[31]); 255 (void *) regs->regs[31]);
256 256
257 printk("Status: %08x ", (uint32_t) regs->cp0_status); 257 printk("Status: %08x ", (uint32_t) regs->cp0_status);
258 258
diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
index b0a25e1ee8b7..64459e7d891b 100644
--- a/arch/mips/sgi-ip27/ip27-nmi.c
+++ b/arch/mips/sgi-ip27/ip27-nmi.c
@@ -1,4 +1,3 @@
1#include <linux/kallsyms.h>
2#include <linux/kernel.h> 1#include <linux/kernel.h>
3#include <linux/mmzone.h> 2#include <linux/mmzone.h>
4#include <linux/nodemask.h> 3#include <linux/nodemask.h>
@@ -84,13 +83,10 @@ void nmi_cpu_eframe_save(nasid_t nasid, int slice)
84 /* 83 /*
85 * Saved cp0 registers 84 * Saved cp0 registers
86 */ 85 */
87 printk("epc : %016lx ", nr->epc); 86 printk("epc : %016lx %pS\n", nr->epc, (void *) nr->epc);
88 print_symbol("%s ", nr->epc);
89 printk("%s\n", print_tainted()); 87 printk("%s\n", print_tainted());
90 printk("ErrEPC: %016lx ", nr->error_epc); 88 printk("ErrEPC: %016lx %pS\n", nr->error_epc, (void *) nr->error_epc);
91 print_symbol("%s\n", nr->error_epc); 89 printk("ra : %016lx %pS\n", nr->gpr[31], (void *) nr->gpr[31]);
92 printk("ra : %016lx ", nr->gpr[31]);
93 print_symbol("%s\n", nr->gpr[31]);
94 printk("Status: %08lx ", nr->sr); 90 printk("Status: %08lx ", nr->sr);
95 91
96 if (nr->sr & ST0_KX) 92 if (nr->sr & ST0_KX)