2 files changed, 14 insertions, 3 deletions

diff --git a/include/asm-s390/sfp-machine.h b/include/asm-s390/sfp-machine.h
index 8ca8c77b2d04..4e16aede4b06 100644
--- a/include/asm-s390/sfp-machine.h
+++ b/include/asm-s390/sfp-machine.h
@@ -27,9 +27,9 @@
    
 
 #define _FP_W_TYPE_SIZE         32
-#define _FP_W_TYPE              unsigned long
-#define _FP_WS_TYPE             signed long
-#define _FP_I_TYPE              long
+#define _FP_W_TYPE              unsigned int
+#define _FP_WS_TYPE             signed int
+#define _FP_I_TYPE              int
 
 #define _FP_MUL_MEAT_S(R,X,Y)                                   \
   _FP_MUL_MEAT_1_wide(_FP_WFRACBITS_S,R,X,Y,umul_ppmm)
diff --git a/include/asm-s390/sfp-util.h b/include/asm-s390/sfp-util.h
index 8cabcd23d976..0addc6466d95 100644
--- a/include/asm-s390/sfp-util.h
+++ b/include/asm-s390/sfp-util.h
@@ -51,6 +51,16 @@
         wl = __wl;                                      \
 })
 
+#ifdef __s390x__
+#define udiv_qrnnd(q, r, n1, n0, d)                     \
+  do { unsigned long __n;                               \
+       unsigned int __r, __d;                           \
+    __n = ((unsigned long)(n1) << 32) + n0;             \
+    __d = (d);                                          \
+    (q) = __n / __d;                                    \
+    (r) = __n % __d;                                    \
+  } while (0)
+#else
 #define udiv_qrnnd(q, r, n1, n0, d)                     \
   do { unsigned int __r;                                \
     (q) = __udiv_qrnnd (&__r, (n1), (n0), (d));         \
@@ -58,6 +68,7 @@
   } while (0)
 extern unsigned long __udiv_qrnnd (unsigned int *, unsigned int,
                                    unsigned int , unsigned int);
+#endif
 
 #define UDIV_NEEDS_NORMALIZATION 0