From 0bd3f15db5e492bdd32df81dba33b9164c33f533 Mon Sep 17 00:00:00 2001
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Tue, 10 Jul 2007 11:24:14 +0200
Subject: [PATCH] --- yaml --- r: 58603 b: refs/heads/master c:
 8a88367088a6b9964d99694b30d80720f019bea2 h: refs/heads/master i:   58601:
 b5b8a47a14100aaedf8554055888eb50158548fd   58599:
 fc5ee4cf52df4332fb6dba64c43646837979557f v: v3

---
 [refs]                               |  2 +-
 trunk/arch/s390/lib/Makefile         |  4 ++--
 trunk/include/asm-s390/sfp-machine.h |  6 +++---
 trunk/include/asm-s390/sfp-util.h    | 11 +++++++++++
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 28fa87ba7d9e..0d71d89d202a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 285f67227b63309d699f5bda25ba34962503398f
+refs/heads/master: 8a88367088a6b9964d99694b30d80720f019bea2
diff --git a/trunk/arch/s390/lib/Makefile b/trunk/arch/s390/lib/Makefile
index 59aea65ce99f..52084436ab69 100644
--- a/trunk/arch/s390/lib/Makefile
+++ b/trunk/arch/s390/lib/Makefile
@@ -4,7 +4,7 @@
 
 EXTRA_AFLAGS := -traditional
 
-lib-y += delay.o string.o uaccess_std.o uaccess_pt.o qrnnd.o
-obj-$(CONFIG_32BIT) += div64.o
+lib-y += delay.o string.o uaccess_std.o uaccess_pt.o
+obj-$(CONFIG_32BIT) += div64.o qrnnd.o
 lib-$(CONFIG_64BIT) += uaccess_mvcos.o
 lib-$(CONFIG_SMP) += spinlock.o
diff --git a/trunk/include/asm-s390/sfp-machine.h b/trunk/include/asm-s390/sfp-machine.h
index 8ca8c77b2d04..4e16aede4b06 100644
--- a/trunk/include/asm-s390/sfp-machine.h
+++ b/trunk/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/trunk/include/asm-s390/sfp-util.h b/trunk/include/asm-s390/sfp-util.h
index 8cabcd23d976..0addc6466d95 100644
--- a/trunk/include/asm-s390/sfp-util.h
+++ b/trunk/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