Merge branch 'smack-for-3.16' of git://git.gitorious.org/smack-next/kernel into next

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / math-emu / fsqrts.c

diff --git a/arch/powerpc/math-emu/fsqrts.c b/arch/powerpc/math-emu/fsqrts.c
index 2843be986e2e97aa1a09f2ad8e5e7eb46cdd9852..31dccbfc39ff8073a66849e3ca2617b40b1bc34c 100644 (file)
--- a/arch/powerpc/math-emu/fsqrts.c
+++ b/arch/powerpc/math-emu/fsqrts.c
@@ -13,7 +13,6 @@ fsqrts(void *frD, void *frB)
        FP_DECL_D(B);
        FP_DECL_D(R);
        FP_DECL_EX;
-       int ret = 0;
 
 #ifdef DEBUG
        printk("%s: %p %p %p %p\n", __func__, frD, frB);
@@ -26,9 +25,9 @@ fsqrts(void *frD, void *frB)
 #endif
 
        if (B_s && B_c != FP_CLS_ZERO)
-               ret |= EFLAG_VXSQRT;
+               FP_SET_EXCEPTION(EFLAG_VXSQRT);
        if (B_c == FP_CLS_NAN)
-               ret |= EFLAG_VXSNAN;
+               FP_SET_EXCEPTION(EFLAG_VXSNAN);
 
        FP_SQRT_D(R, B);