2 files changed, 1 insertions, 2 deletions

diff --git a/arch/mips/kernel/smp-bmips.c b/arch/mips/kernel/smp-bmips.c
index 76f31353e718..c0bb4d59076a 100644
--- a/arch/mips/kernel/smp-bmips.c
+++ b/arch/mips/kernel/smp-bmips.c
@@ -173,7 +173,7 @@ static void bmips_boot_secondary(int cpu, struct task_struct *idle)
         else {
 #if defined(CONFIG_CPU_BMIPS4350) || defined(CONFIG_CPU_BMIPS4380)
                 /* Reset slave TP1 if booting from TP0 */
-                if (cpu_logical_map(cpu) == 0)
+                if (cpu_logical_map(cpu) == 1)
                         set_c0_brcm_cmt_ctrl(0x01);
 #elif defined(CONFIG_CPU_BMIPS5000)
                 if (cpu & 0x01)
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index c89568f88bfd..aec3408edd4b 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1242,7 +1242,6 @@ asmlinkage void do_mcheck(struct pt_regs *regs)
         panic("Caught Machine Check exception - %scaused by multiple "
               "matching entries in the TLB.",
               (multi_match) ? "" : "not ");
-        exception_exit(prev_state);
 }
 
 asmlinkage void do_mt(struct pt_regs *regs)