1 files changed, 7 insertions, 32 deletions

diff --git a/arch/mips/math-emu/ieee754d.c b/arch/mips/math-emu/ieee754d.c
index 9599bdd32585..a04e8a7e5ac3 100644
--- a/arch/mips/math-emu/ieee754d.c
+++ b/arch/mips/math-emu/ieee754d.c
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ *  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
  *
  *  Nov 7, 2000
  *  Modified to build and operate in Linux kernel environment.
@@ -25,38 +25,13 @@
  *  Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved.
  */
 
-#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/printk.h>
 #include "ieee754.h"
+#include "ieee754sp.h"
+#include "ieee754dp.h"
 
-#define DP_EBIAS        1023
-#define DP_EMIN         (-1022)
-#define DP_EMAX         1023
-#define DP_FBITS        52
-
-#define SP_EBIAS        127
-#define SP_EMIN         (-126)
-#define SP_EMAX         127
-#define SP_FBITS        23
-
-#define DP_MBIT(x)      ((u64)1 << (x))
-#define DP_HIDDEN_BIT   DP_MBIT(DP_FBITS)
-#define DP_SIGN_BIT     DP_MBIT(63)
-
-
-#define SP_MBIT(x)      ((u32)1 << (x))
-#define SP_HIDDEN_BIT   SP_MBIT(SP_FBITS)
-#define SP_SIGN_BIT     SP_MBIT(31)
-
-
-#define SPSIGN(sp)      (sp.parts.sign)
-#define SPBEXP(sp)      (sp.parts.bexp)
-#define SPMANT(sp)      (sp.parts.mant)
-
-#define DPSIGN(dp)      (dp.parts.sign)
-#define DPBEXP(dp)      (dp.parts.bexp)
-#define DPMANT(dp)      (dp.parts.mant)
-
-ieee754dp ieee754dp_dump(char *m, ieee754dp x)
+union ieee754dp ieee754dp_dump(char *m, union ieee754dp x)
 {
         int i;
 
@@ -96,7 +71,7 @@ ieee754dp ieee754dp_dump(char *m, ieee754dp x)
         return x;
 }
 
-ieee754sp ieee754sp_dump(char *m, ieee754sp x)
+union ieee754sp ieee754sp_dump(char *m, union ieee754sp x)
 {
         int i;