1 files changed, 9 insertions, 5 deletions

diff --git a/arch/powerpc/math-emu/fmul.c b/arch/powerpc/math-emu/fmul.c
index 2f3d32784a04..391fd17d3440 100644
--- a/arch/powerpc/math-emu/fmul.c
+++ b/arch/powerpc/math-emu/fmul.c
@@ -2,8 +2,9 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
 
 int
 fmul(void *frD, void *frA, void *frB)
@@ -11,14 +12,15 @@ fmul(void *frD, void *frA, void *frB)
         FP_DECL_D(A);
         FP_DECL_D(B);
         FP_DECL_D(R);
+        FP_DECL_EX;
         int ret = 0;
 
 #ifdef DEBUG
         printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
 
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
+        FP_UNPACK_DP(A, frA);
+        FP_UNPACK_DP(B, frB);
 
 #ifdef DEBUG
         printk("A: %ld %lu %lu %ld (%ld) [%08lx.%08lx %lx]\n",
@@ -38,5 +40,7 @@ fmul(void *frD, void *frA, void *frB)
                R_s, R_f1, R_f0, R_e, R_c, R_f1, R_f0, R_e + 1023);
 #endif
 
-        return (ret | __FP_PACK_D(frD, R));
+        __FP_PACK_D(frD, R);
+
+        return FP_CUR_EXCEPTIONS;
 }