--- zzzz-none-000/linux-2.4.17/arch/mips/math-emu/sp_fdp.c	2001-04-14 03:26:07.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/arch/mips/math-emu/sp_fdp.c	2004-11-24 13:22:40.000000000 +0000
@@ -30,20 +30,24 @@
 ieee754sp ieee754sp_fdp(ieee754dp x)
 {
 	COMPXDP;
+	ieee754sp nan;
+
+	EXPLODEXDP;
 
 	CLEARCX;
 
-	EXPLODEXDP;
+	FLUSHXDP;
 
 	switch (xc) {
-	case IEEE754_CLASS_QNAN:
 	case IEEE754_CLASS_SNAN:
-		return ieee754sp_nanxcpt(buildsp(xs,
-						 SP_EMAX + 1 + SP_EBIAS,
-						 (unsigned long)
-						 (xm >>
-						  (DP_MBITS - SP_MBITS))),
-					 "fdp", x);
+		SETCX(IEEE754_INVALID_OPERATION);
+		return ieee754sp_nanxcpt(ieee754sp_indef(), "fdp");
+	case IEEE754_CLASS_QNAN:
+		nan = buildsp(xs, SP_EMAX + 1 + SP_EBIAS, (unsigned long)
+				(xm >> (DP_MBITS - SP_MBITS)));
+		if (!ieee754sp_isnan(nan))
+			nan = ieee754sp_indef();
+		return ieee754sp_nanxcpt(nan, "fdp", x);
 	case IEEE754_CLASS_INF:
 		return ieee754sp_inf(xs);
 	case IEEE754_CLASS_ZERO: