Merge branch 'docs-next' of git://git.lwn.net/linux-2.6

[pandora-kernel.git] / arch / powerpc / math-emu / fdivs.c

diff --git a/arch/powerpc/math-emu/fdivs.c b/arch/powerpc/math-emu/fdivs.c
index 797f6a9..526bc26 100644 (file)
--- a/arch/powerpc/math-emu/fdivs.c
+++ b/arch/powerpc/math-emu/fdivs.c
@@ -14,7 +14,6 @@ fdivs(void *frD, void *frA, void *frB)
        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);
@@ -29,22 +28,22 @@ fdivs(void *frD, void *frA, void *frB)
 #endif
 
        if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {
-               ret |= EFLAG_VXZDZ;
+               FP_SET_EXCEPTION(EFLAG_VXZDZ);
 #ifdef DEBUG
                printk("%s: FPSCR_VXZDZ raised\n", __func__);
 #endif
        }
        if (A_c == FP_CLS_INF && B_c == FP_CLS_INF) {
-               ret |= EFLAG_VXIDI;
+               FP_SET_EXCEPTION(EFLAG_VXIDI);
 #ifdef DEBUG
                printk("%s: FPSCR_VXIDI raised\n", __func__);
 #endif
        }
 
        if (B_c == FP_CLS_ZERO && A_c != FP_CLS_ZERO) {
-               ret |= EFLAG_DIVZERO;
+               FP_SET_EXCEPTION(EFLAG_DIVZERO);
                if (__FPU_TRAP_P(EFLAG_DIVZERO))
-                       return ret;
+                       return FP_CUR_EXCEPTIONS;
        }
 
        FP_DIV_D(R, A, B);