diff -Nru link/arch/mips/kernel/r2300_switch.S.orig link/arch/mips/kernel/r2300_switch.S
--- link/arch/mips/kernel/r2300_switch.S.orig	Tue Nov  5 06:56:59 2002
+++ link/arch/mips/kernel/r2300_switch.S	Tue Nov  5 10:41:39 2002
@@ -56,7 +56,7 @@
 	 * check if we need to save FPU registers
 	 */
 	lw	t3, TASK_THREAD_INFO(a0)
-	lw	t0, TI_FLAGS(a3)
+	lw	t0, TI_FLAGS(t3)
 	li	t1, TIF_USEDFPU
 	and	t2, t0, t1
 	beqz	t2, 1f
diff -Nru link/arch/mips/kernel/r4k_switch.S.orig link/arch/mips/kernel/r4k_switch.S
--- link/arch/mips/kernel/r4k_switch.S.orig	Tue Nov  5 06:56:59 2002
+++ link/arch/mips/kernel/r4k_switch.S	Tue Nov  5 10:41:53 2002
@@ -55,7 +55,7 @@
 	 * check if we need to save FPU registers
 	 */
 	lw	t3, TASK_THREAD_INFO(a0)
-	lw	t0, TI_FLAGS(a3)
+	lw	t0, TI_FLAGS(t3)
 	li	t1, _TIF_USEDFPU
 	and	t2, t0, t1
 	beqz	t2, 1f
diff -Nru link/arch/mips64/kernel/r4k_switch.S.orig link/arch/mips64/kernel/r4k_switch.S
--- link/arch/mips64/kernel/r4k_switch.S.orig	Tue Nov  5 06:56:59 2002
+++ link/arch/mips64/kernel/r4k_switch.S	Tue Nov  5 10:42:15 2002
@@ -51,14 +51,14 @@
 	 * check if we need to save FPU registers
 	 */
 	ld	t3, TASK_THREAD_INFO(a0)
-	ld	t0, TI_FLAGS(a3)
+	ld	t0, TI_FLAGS(t3)
 	li	t1, TIF_USEDFPU
 	and	t2, t0, t1
 	beqz	t2, 1f
 	nor	t1, zero, t1
 
 	and	t0, t0, t1
-	sd	t0, TASK_FLAGS(a3)
+	sd	t0, TASK_FLAGS(t3)
 
 	/*
 	 * clear saved user stack CU1 bit
diff -Nru link/include/asm-mips/fpu.h.orig link/include/asm-mips/fpu.h
--- link/include/asm-mips/fpu.h.orig	Tue Nov  5 06:56:58 2002
+++ link/include/asm-mips/fpu.h	Tue Nov  5 10:46:22 2002
@@ -77,7 +77,7 @@
 static inline int is_fpu_owner(void)
 {
 	return (mips_cpu.options & MIPS_CPU_FPU) && 
-		test_and_set_thread_flag(TIF_USEDFPU); 
+		test_thread_flag(TIF_USEDFPU); 
 }
 
 static inline void own_fpu(void)
diff -Nru link/include/asm-mips64/fpu.h.orig link/include/asm-mips64/fpu.h
--- link/include/asm-mips64/fpu.h.orig	Tue Nov  5 06:56:59 2002
+++ link/include/asm-mips64/fpu.h	Tue Nov  5 10:47:35 2002
@@ -77,7 +77,7 @@
 static inline int is_fpu_owner(void)
 {
 	return (mips_cpu.options & MIPS_CPU_FPU) && 
-		test_and_set_thread_flag(TIF_USEDFPU); 
+		test_thread_flag(TIF_USEDFPU); 
 }
 
 static inline void own_fpu(void)