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 @@
  */
 
 #include <linux/device.h>
-#include <linux/kallsyms.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/module.h>
@@ -84,9 +83,9 @@ void mips_mt_regdump(unsigned long mvpctl)
                                        read_vpe_c0_vpeconf0());
                                 printk("   VPE%d.Status : %08lx\n",
                                        i, read_vpe_c0_status());
-                                printk("   VPE%d.EPC : %08lx ",
-                                       i, read_vpe_c0_epc());
-                                print_symbol("%s\n", read_vpe_c0_epc());
+                                printk("   VPE%d.EPC : %08lx %pS\n",
+                                       i, read_vpe_c0_epc(),
+                                       (void *) read_vpe_c0_epc());
                                 printk("   VPE%d.Cause : %08lx\n",
                                        i, read_vpe_c0_cause());
                                 printk("   VPE%d.Config7 : %08lx\n",
@@ -111,8 +110,8 @@ void mips_mt_regdump(unsigned long mvpctl)
                 }
                 printk("   TCStatus : %08lx\n", tcstatval);
                 printk("   TCBind : %08lx\n", read_tc_c0_tcbind());
-                printk("   TCRestart : %08lx ", read_tc_c0_tcrestart());
-                print_symbol("%s\n", read_tc_c0_tcrestart());
+                printk("   TCRestart : %08lx %pS\n",
+                       read_tc_c0_tcrestart(), (void *) read_tc_c0_tcrestart());
                 printk("   TCHalt : %08lx\n", haltval);
                 printk("   TCContext : %08lx\n", read_tc_c0_tccontext());
                 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)
         /*
          * Saved cp0 registers
          */
-        printk("epc   : %0*lx ", field, regs->cp0_epc);
-        print_symbol("%s ", regs->cp0_epc);
+        printk("epc   : %0*lx %pS\n", field, regs->cp0_epc,
+               (void *) regs->cp0_epc);
         printk("    %s\n", print_tainted());
-        printk("ra    : %0*lx ", field, regs->regs[31]);
-        print_symbol("%s\n", regs->regs[31]);
+        printk("ra    : %0*lx %pS\n", field, regs->regs[31],
+               (void *) regs->regs[31]);
 
         printk("Status: %08x    ", (uint32_t) regs->cp0_status);
 
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 @@
-#include <linux/kallsyms.h>
 #include <linux/kernel.h>
 #include <linux/mmzone.h>
 #include <linux/nodemask.h>
@@ -84,13 +83,10 @@ void nmi_cpu_eframe_save(nasid_t nasid, int slice)
         /*
          * Saved cp0 registers
          */
-        printk("epc   : %016lx ", nr->epc);
-        print_symbol("%s ", nr->epc);
+        printk("epc   : %016lx %pS\n", nr->epc, (void *) nr->epc);
         printk("%s\n", print_tainted());
-        printk("ErrEPC: %016lx ", nr->error_epc);
-        print_symbol("%s\n", nr->error_epc);
-        printk("ra    : %016lx ", nr->gpr[31]);
-        print_symbol("%s\n", nr->gpr[31]);
+        printk("ErrEPC: %016lx %pS\n", nr->error_epc, (void *) nr->error_epc);
+        printk("ra    : %016lx %pS\n", nr->gpr[31], (void *) nr->gpr[31]);
         printk("Status: %08lx         ", nr->sr);
 
         if (nr->sr & ST0_KX)