From 07c047631c55f289f40766123943283530ca1f1a Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 9 May 2005 13:16:07 +0000
Subject: [PATCH] --- yaml --- r: 11083 b: refs/heads/master c:
 1d74f6bc85cbdc4601e5aea1e67ccbd259f0c7f4 h: refs/heads/master i:   11081:
 cf0ba886906c01077f4d9fb1efc3ec10d52afa52   11079:
 f885b9ed90b58f9fb6ce50c52a30307227822662 v: v3

---
 [refs]                          |  2 +-
 trunk/arch/mips/kernel/branch.c | 10 +++++++---
 trunk/include/asm-mips/fpu.h    |  9 +++++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 8b4468a6697e..8abcefdbf1e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d547c5cc2186be9d74b0c595dc8059aef56cd445
+refs/heads/master: 1d74f6bc85cbdc4601e5aea1e67ccbd259f0c7f4
diff --git a/trunk/arch/mips/kernel/branch.c b/trunk/arch/mips/kernel/branch.c
index 01117e977a7f..56aea5f526a7 100644
--- a/trunk/arch/mips/kernel/branch.c
+++ b/trunk/arch/mips/kernel/branch.c
@@ -12,6 +12,7 @@
 #include <asm/branch.h>
 #include <asm/cpu.h>
 #include <asm/cpu-features.h>
+#include <asm/fpu.h>
 #include <asm/inst.h>
 #include <asm/ptrace.h>
 #include <asm/uaccess.h>
@@ -161,10 +162,13 @@ int __compute_return_epc(struct pt_regs *regs)
 	 * And now the FPA/cp1 branch instructions.
 	 */
 	case cop1_op:
-		if (!cpu_has_fpu)
-			fcr31 = current->thread.fpu.soft.fcr31;
-		else
+		preempt_disable();
+		if (is_fpu_owner())
 			asm volatile("cfc1\t%0,$31" : "=r" (fcr31));
+		else
+			fcr31 = current->thread.fpu.hard.fcr31;
+		preempt_enable();
+
 		bit = (insn.i_format.rt >> 2);
 		bit += (bit != 0);
 		bit += 23;
diff --git a/trunk/include/asm-mips/fpu.h b/trunk/include/asm-mips/fpu.h
index ea24e733b1bc..9c828b1f8218 100644
--- a/trunk/include/asm-mips/fpu.h
+++ b/trunk/include/asm-mips/fpu.h
@@ -80,9 +80,14 @@ do {									\
 
 #define clear_fpu_owner()	clear_thread_flag(TIF_USEDFPU)
 
+static inline int __is_fpu_owner(void)
+{
+	return test_thread_flag(TIF_USEDFPU);
+}
+
 static inline int is_fpu_owner(void)
 {
-	return cpu_has_fpu && test_thread_flag(TIF_USEDFPU);
+	return cpu_has_fpu && __is_fpu_owner();
 }
 
 static inline void own_fpu(void)
@@ -127,7 +132,7 @@ static inline void restore_fp(struct task_struct *tsk)
 static inline fpureg_t *get_fpu_regs(struct task_struct *tsk)
 {
 	if (cpu_has_fpu) {
-		if ((tsk == current) && is_fpu_owner())
+		if ((tsk == current) && __is_fpu_owner())
 			_save_fp(current);
 		return tsk->thread.fpu.hard.fpr;
 	}