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

1 files changed, 3 insertions, 2 deletions

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 6f3ff9690686..7058893d5ad2 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -534,13 +534,14 @@ static inline int simulate_rdhwr(struct pt_regs *regs)
                 switch (rd) {
                         case 29:
                                 regs->regs[rt] = ti->tp_value;
-                                break;
+                                return 0;
                         default:
                                 return -EFAULT;
                 }
         }
 
-        return 0;
+        /* Not ours.  */
+        return -EFAULT;
 }
 
 asmlinkage void do_ov(struct pt_regs *regs)