1 files changed, 19 insertions, 1 deletions

diff --git a/arch/powerpc/math-emu/mtfsf.c b/arch/powerpc/math-emu/mtfsf.c
index 48014d8e3af1..dbce92e4f046 100644
--- a/arch/powerpc/math-emu/mtfsf.c
+++ b/arch/powerpc/math-emu/mtfsf.c
@@ -2,12 +2,14 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
 
 int
 mtfsf(unsigned int FM, u32 *frB)
 {
         u32 mask;
+        u32 fpscr;
 
         if (FM == 0)
                 return 0;
@@ -37,6 +39,22 @@ mtfsf(unsigned int FM, u32 *frB)
         __FPU_FPSCR &= ~(mask);
         __FPU_FPSCR |= (frB[1] & mask);
 
+        __FPU_FPSCR &= ~(FPSCR_VX);
+        if (__FPU_FPSCR & (FPSCR_VXSNAN | FPSCR_VXISI | FPSCR_VXIDI |
+                     FPSCR_VXZDZ | FPSCR_VXIMZ | FPSCR_VXVC |
+                     FPSCR_VXSOFT | FPSCR_VXSQRT | FPSCR_VXCVI))
+                __FPU_FPSCR |= FPSCR_VX;
+
+        fpscr = __FPU_FPSCR;
+        fpscr &= ~(FPSCR_FEX);
+        if (((fpscr & FPSCR_VX) && (fpscr & FPSCR_VE)) ||
+            ((fpscr & FPSCR_OX) && (fpscr & FPSCR_OE)) ||
+            ((fpscr & FPSCR_UX) && (fpscr & FPSCR_UE)) ||
+            ((fpscr & FPSCR_ZX) && (fpscr & FPSCR_ZE)) ||
+            ((fpscr & FPSCR_XX) && (fpscr & FPSCR_XE)))
+                fpscr |= FPSCR_FEX;
+        __FPU_FPSCR = fpscr;
+
 #ifdef DEBUG
         printk("%s: %02x %p: %08lx\n", __func__, FM, frB, __FPU_FPSCR);
 #endif