Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (54 commits)
  [MIPS] Remove mips_machtype for LASAT machines
  [MIPS] Remove mips_machtype from EMMA2RH machines
  [MIPS] Remove mips_machtype from ARC based machines
  [MIPS] MTX-1 flash partition setup move to platform devices registration
  [MIPS] TXx9: cleanup and fix some sparse warnings
  [MIPS] TXx9: rename asm-mips/mach-jmr3927 to asm-mips/mach-tx39xx
  [MIPS] remove machtype for group Toshiba
  [MIPS] separate rbtx4927_time_init() and rbtx4937_time_init()
  [MIPS] separate rbtx4927_arch_init() and rbtx4937_arch_init()
  [MIPS] txx9_cpu_clock setup move to rbtx4927_time_init()
  [MIPS] txx9_board_vec set directly without mips_machtype
  [MIPS] IP22: Add platform device for Indy volume buttons
  [MIPS] cmbvr4133: Remove support
  [MIPS] remove wrppmc_machine_power_off()
  [MIPS] replace inline assembler to cpu_wait()
  [MIPS] IP22/28: Add platform devices for HAL2
  [MIPS] TXx9: Update and merge defconfigs
  [MIPS] TXx9: Make single kernel can support multiple boards
  [MIPS] TXx9: Update defconfigs
  [MIPS] TXx9: Reorganize PCI code
  ...

1 files changed, 5 insertions, 6 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)