Merge branch 'core/softlockup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / mips / kernel / mips-mt.c

diff --git a/arch/mips/kernel/mips-mt.c b/arch/mips/kernel/mips-mt.c
index 7169a4d..d01665a 100644 (file)
--- a/arch/mips/kernel/mips-mt.c
+++ b/arch/mips/kernel/mips-mt.c
@@ -16,7 +16,6 @@
 #include <asm/system.h>
 #include <asm/hardirq.h>
 #include <asm/mmu_context.h>
-#include <asm/smp.h>
 #include <asm/mipsmtregs.h>
 #include <asm/r4kcache.h>
 #include <asm/cacheflush.h>
@@ -84,8 +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\n",
-                                      i, 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",
@@ -110,7 +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\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)
@@ -233,7 +234,7 @@ void mips_mt_set_cpuoptions(void)
        if (oconfig7 != nconfig7) {
                __asm__ __volatile("sync");
                write_c0_config7(nconfig7);
-               ehb ();
+               ehb();
                printk("Config7: 0x%08x\n", read_c0_config7());
        }