X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=arch%2Fmips%2Fkernel%2Fbranch.c;h=76fd3f22c76624363d94b7e4b870d0e798ff282d;hb=34641a58a227e498adf471ab016bd054cc399d7e;hp=374de839558d58467c381a6384df6a634b506219;hpb=b0c4e148bd591629749d02a8fbc8d81c26d548cf;p=powerpc.git

diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c
index 374de83955..76fd3f22c7 100644
--- a/arch/mips/kernel/branch.c
+++ b/arch/mips/kernel/branch.c
@@ -178,13 +178,13 @@ int __compute_return_epc(struct pt_regs *regs)
 		if (is_fpu_owner())
 			asm volatile("cfc1\t%0,$31" : "=r" (fcr31));
 		else
-			fcr31 = current->thread.fpu.hard.fcr31;
+			fcr31 = current->thread.fpu.fcr31;
 		preempt_enable();
 
 		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))