Merge tag 'upstream-3.13-rc1' of git://git.infradead.org/linux-ubifs

[karo-tx-linux.git] / arch / mips / math-emu / dp_flong.c

diff --git a/arch/mips/math-emu/dp_flong.c b/arch/mips/math-emu/dp_flong.c
index cb105b1dd860fcc37c1d1c5e19cc5ac3358913a4..14fc01ec742d2c0d45833bdd610d7590a0ef2c49 100644 (file)
--- a/arch/mips/math-emu/dp_flong.c
+++ b/arch/mips/math-emu/dp_flong.c
@@ -4,7 +4,6 @@
 /*
  * MIPS floating point support
  * Copyright (C) 1994-2000 Algorithmics Ltd.
- * http://www.algor.co.uk
  *
  * ########################################################################
  *
@@ -29,12 +28,12 @@
 
 ieee754dp ieee754dp_flong(s64 x)
 {
-       COMPXDP;
+       u64 xm;
+       int xe;
+       int xs;
 
        CLEARCX;
 
-       xc = ( 0 ? xc : xc );
-
        if (x == 0)
                return ieee754dp_zero(0);
        if (x == 1 || x == -1)