From: Ralf Baechle Date: Wed, 26 Apr 2006 20:33:03 +0000 (+0100) Subject: [MIPS] Fix branch emulation for floating-point exceptions. X-Git-Tag: v2.6.17-rc4~139^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ee1cca1b0661fa33fd99f2d8ec7e2749432f9b1d;p=linux-2.6-omap-h63xx.git [MIPS] Fix branch emulation for floating-point exceptions. In the branch emulation for floating-point exceptions, __compute_return_epc must determine for bc1f et al which condition code bit to test. This is based on bits <4:2> of the rt field. The switch statement to distinguish bc1f et al needs to use only the two low bits of rt, but the old code tests on the whole rt field. This patch masks off the proper bits. Signed-off-by: Win Treese Signed-off-by: Ralf Baechle --- diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c index 374de839558..b6232d9033c 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) bit = (insn.i_format.rt >> 2); bit += (bit != 0); bit += 23; - switch (insn.i_format.rt) { + switch (insn.i_format.rt & 3) { case 0: /* bc1f */ case 2: /* bc1fl */ if (~fcr31 & (1 << bit))