Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6

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

diff --git a/arch/powerpc/math-emu/fcmpo.c b/arch/powerpc/math-emu/fcmpo.c
index b5dc449..5bce011 100644 (file)
--- a/arch/powerpc/math-emu/fcmpo.c
+++ b/arch/powerpc/math-emu/fcmpo.c
@@ -14,7 +14,6 @@ fcmpo(u32 *ccr, int crfD, void *frA, void *frB)
        FP_DECL_EX;
        int code[4] = { (1 << 3), (1 << 1), (1 << 2), (1 << 0) };
        long cmp;
-       int ret = 0;
 
 #ifdef DEBUG
        printk("%s: %p (%08x) %d %p %p\n", __func__, ccr, *ccr, crfD, frA, frB);
@@ -29,7 +28,7 @@ fcmpo(u32 *ccr, int crfD, void *frA, void *frB)
 #endif
 
        if (A_c == FP_CLS_NAN || B_c == FP_CLS_NAN)
-               ret |= EFLAG_VXVC;
+               FP_SET_EXCEPTION(EFLAG_VXVC);
 
        FP_CMP_D(cmp, A, B, 2);
        cmp = code[(cmp + 1) & 3];
@@ -44,5 +43,5 @@ fcmpo(u32 *ccr, int crfD, void *frA, void *frB)
        printk("CR: %08x\n", *ccr);
 #endif
 
-       return ret;
+       return FP_CUR_EXCEPTIONS;
 }