patch-2.4.22 linux-2.4.22/arch/mips/kernel/branch.c

Next file: linux-2.4.22/arch/mips/kernel/cpu-probe.c
Previous file: linux-2.4.22/arch/mips/kernel/Makefile
Back to the patch index
Back to the overall index

diff -urN linux-2.4.21/arch/mips/kernel/branch.c linux-2.4.22/arch/mips/kernel/branch.c
@@ -163,10 +163,10 @@
 	 * And now the FPA/cp1 branch instructions.
 	 */
 	case cop1_op:
-		if (!(mips_cpu.options & MIPS_CPU_FPU))
+		if (!cpu_has_fpu)
 			fcr31 = current->thread.fpu.soft.sr;
 		else
-			asm("cfc1\t%0,$31":"=r" (fcr31));
+			asm volatile("cfc1\t%0,$31" : "=r" (fcr31));
 		bit = (insn.i_format.rt >> 2);
 		bit += (bit != 0);
 		bit += 23;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)