Merge master.kernel.org:/home/rmk/linux-2.6-arm

1 files changed, 14 insertions, 16 deletions

diff --git a/arch/arm/lib/ucmpdi2.c b/arch/arm/lib/ucmpdi2.c
index 6c6ae63efa02..57f3f2df3850 100644
--- a/arch/arm/lib/ucmpdi2.c
+++ b/arch/arm/lib/ucmpdi2.c
@@ -31,21 +31,19 @@ Boston, MA 02111-1307, USA.  */
 
 #include "gcclib.h"
 
-word_type
-__ucmpdi2 (DItype a, DItype b)
+int __ucmpdi2(s64 a, s64 b)
 {
-  DIunion au, bu;
-
-  au.ll = a, bu.ll = b;
-
-  if ((USItype) au.s.high < (USItype) bu.s.high)
-    return 0;
-  else if ((USItype) au.s.high > (USItype) bu.s.high)
-    return 2;
-  if ((USItype) au.s.low < (USItype) bu.s.low)
-    return 0;
-  else if ((USItype) au.s.low > (USItype) bu.s.low)
-    return 2;
-  return 1;
+        DIunion au, bu;
+
+        au.ll = a, bu.ll = b;
+
+        if ((u32) au.s.high < (u32) bu.s.high)
+                return 0;
+        else if ((u32) au.s.high > (u32) bu.s.high)
+                return 2;
+        if ((u32) au.s.low < (u32) bu.s.low)
+                return 0;
+        else if ((u32) au.s.low > (u32) bu.s.low)
+                return 2;
+        return 1;
 }
-