diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-06 04:14:25 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-06 04:14:25 -0500 |
| commit | 6cf5bcaaf9a92225017f7a3f1a630f6b5147ad4a (patch) | |
| tree | bf5fead8ac5333346b17d34a1d2f8f9d5dc608be /arch/mips/kernel/traps.c | |
| parent | 6fc88198961141c2d9d34cde0855fb2e85ea3382 (diff) | |
| parent | 436b0f76f2cee6617f27a649637766628909dd5d (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/mips/kernel/traps.c')
| -rw-r--r-- | arch/mips/kernel/traps.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 6f3ff969068..7058893d5ad 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) |