Merge remote-tracking branch 'iwlwifi-fixes/master' into NEXT

[sfrench/cifs-2.6.git] / arch / mips / include / asm / fpu.h

diff --git a/arch/mips/include/asm/fpu.h b/arch/mips/include/asm/fpu.h
index a939574f829387c800b4b57de09f94b00c8ef745..4d0aeda6839741ea27f956e9049958cdab297b56 100644 (file)
--- a/arch/mips/include/asm/fpu.h
+++ b/arch/mips/include/asm/fpu.h
@@ -21,6 +21,7 @@
 #include <asm/hazards.h>
 #include <asm/processor.h>
 #include <asm/current.h>
+#include <asm/msa.h>
 
 #ifdef CONFIG_MIPS_MT_FPAFF
 #include <asm/mips_mt.h>
@@ -141,13 +142,21 @@ static inline int own_fpu(int restore)
 static inline void lose_fpu(int save)
 {
        preempt_disable();
-       if (is_fpu_owner()) {
+       if (is_msa_enabled()) {
+               if (save) {
+                       save_msa(current);
+                       asm volatile("cfc1 %0, $31"
+                               : "=r"(current->thread.fpu.fcr31));
+               }
+               disable_msa();
+               clear_thread_flag(TIF_USEDMSA);
+       } else if (is_fpu_owner()) {
                if (save)
                        _save_fp(current);
-               KSTK_STATUS(current) &= ~ST0_CU1;
-               clear_thread_flag(TIF_USEDFPU);
                __disable_fpu();
        }
+       KSTK_STATUS(current) &= ~ST0_CU1;
+       clear_thread_flag(TIF_USEDFPU);
        preempt_enable();
 }
 
@@ -155,8 +164,6 @@ static inline int init_fpu(void)
 {
        int ret = 0;
 
-       preempt_disable();
-
        if (cpu_has_fpu) {
                ret = __own_fpu();
                if (!ret)
@@ -164,8 +171,6 @@ static inline int init_fpu(void)
        } else
                fpu_emulator_init_fpu();
 
-       preempt_enable();
-
        return ret;
 }