diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-04-29 02:15:57 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-04-29 02:15:57 -0400 |
| commit | 29f147d746326e4db5fe350c70373081d61a2965 (patch) | |
| tree | 04c065ace8c62953441bc22079b93449b996f283 /arch/mips/kernel/branch.c | |
| parent | 916a3d5729c8b710d56acf579f3fdb4de7c03e77 (diff) | |
| parent | 6fb8f3acbe833586eb32598d1f844eb9f77c4fba (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/mips/kernel/branch.c')
| -rw-r--r-- | arch/mips/kernel/branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c index 374de839558d..b6232d9033cb 100644 --- a/arch/mips/kernel/branch.c +++ b/arch/mips/kernel/branch.c | |||
| @@ -184,7 +184,7 @@ int __compute_return_epc(struct pt_regs *regs) | |||
| 184 | bit = (insn.i_format.rt >> 2); | 184 | bit = (insn.i_format.rt >> 2); |
| 185 | bit += (bit != 0); | 185 | bit += (bit != 0); |
| 186 | bit += 23; | 186 | bit += 23; |
| 187 | switch (insn.i_format.rt) { | 187 | switch (insn.i_format.rt & 3) { |
| 188 | case 0: /* bc1f */ | 188 | case 0: /* bc1f */ |
| 189 | case 2: /* bc1fl */ | 189 | case 2: /* bc1fl */ |
| 190 | if (~fcr31 & (1 << bit)) | 190 | if (~fcr31 & (1 << bit)) |