Replace <asm/uaccess.h> with <linux/uaccess.h> globally

[mirror_ubuntu-zesty-kernel.git] / arch / powerpc / math-emu / fmsubs.c

diff --git a/arch/powerpc/math-emu/fmsubs.c b/arch/powerpc/math-emu/fmsubs.c
index 2fdeeb9bb569690b5c5e67adca34f2f3d51f68da..f73965453e0593c06600883993db0e8476e4ef11 100644 (file)
--- a/arch/powerpc/math-emu/fmsubs.c
+++ b/arch/powerpc/math-emu/fmsubs.c
@@ -1,6 +1,6 @@
 #include <linux/types.h>
 #include <linux/errno.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #include <asm/sfp-machine.h>
 #include <math-emu/soft-fp.h>
@@ -16,7 +16,6 @@ fmsubs(void *frD, void *frA, void *frB, void *frC)
        FP_DECL_D(C);
        FP_DECL_D(T);
        FP_DECL_EX;
-       int ret = 0;
 
 #ifdef DEBUG
        printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
@@ -34,7 +33,7 @@ fmsubs(void *frD, void *frA, void *frB, void *frC)
 
        if ((A_c == FP_CLS_INF && C_c == FP_CLS_ZERO) ||
            (A_c == FP_CLS_ZERO && C_c == FP_CLS_INF))
-               ret |= EFLAG_VXIMZ;
+               FP_SET_EXCEPTION(EFLAG_VXIMZ);
 
        FP_MUL_D(T, A, C);
 
@@ -42,7 +41,7 @@ fmsubs(void *frD, void *frA, void *frB, void *frC)
                B_s ^= 1;
 
        if (T_s != B_s && T_c == FP_CLS_INF && B_c == FP_CLS_INF)
-               ret |= EFLAG_VXISI;
+               FP_SET_EXCEPTION(EFLAG_VXISI);
 
        FP_ADD_D(R, T, B);