[PATCH v2 01/15] powerpc/boot: fix do_div for 64bit wrapper

2014-04-24 Thread Cédric Le Goater 
When the boot wrapper is compiled in 64bit, there is no need to
use __div64_32.

Signed-off-by: Cédric Le Goater 
---
 arch/powerpc/boot/stdio.c |   14 ++
 1 file changed, 14 insertions(+)

diff --git a/arch/powerpc/boot/stdio.c b/arch/powerpc/boot/stdio.c
index 5b57800bbc67..a701261b1781 100644
--- a/arch/powerpc/boot/stdio.c
+++ b/arch/powerpc/boot/stdio.c
@@ -21,6 +21,18 @@ size_t strnlen(const char * s, size_t count)
return sc - s;
 }
 
+#ifdef __powerpc64__
+
+# define do_div(n, base) ({\
+   unsigned int __base = (base);   \
+   unsigned int __rem; \
+   __rem = ((unsigned long long)(n)) % __base; \
+   (n) = ((unsigned long long)(n)) / __base;   \
+   __rem;  \
+})
+
+#else
+
 extern unsigned int __div64_32(unsigned long long *dividend,
   unsigned int divisor);
 
@@ -39,6 +51,8 @@ extern unsigned int __div64_32(unsigned long long *dividend,
__rem;  \
  })
 
+#endif /* __powerpc64__ */
+
 static int skip_atoi(const char **s)
 {
int i, c;
-- 
1.7.10.4

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

[PATCH v2 01/15] powerpc/boot: fix do_div for 64bit wrapper

2014-04-14 Thread Cédric Le Goater 
When the boot wrapper is compiled in 64bit, there is no need to
use __div64_32.

Signed-off-by: Cédric Le Goater 
---
 arch/powerpc/boot/stdio.c |   14 ++
 1 file changed, 14 insertions(+)

diff --git a/arch/powerpc/boot/stdio.c b/arch/powerpc/boot/stdio.c
index 5b57800bbc67..a701261b1781 100644
--- a/arch/powerpc/boot/stdio.c
+++ b/arch/powerpc/boot/stdio.c
@@ -21,6 +21,18 @@ size_t strnlen(const char * s, size_t count)
return sc - s;
 }
 
+#ifdef __powerpc64__
+
+# define do_div(n, base) ({\
+   unsigned int __base = (base);   \
+   unsigned int __rem; \
+   __rem = ((unsigned long long)(n)) % __base; \
+   (n) = ((unsigned long long)(n)) / __base;   \
+   __rem;  \
+})
+
+#else
+
 extern unsigned int __div64_32(unsigned long long *dividend,
   unsigned int divisor);
 
@@ -39,6 +51,8 @@ extern unsigned int __div64_32(unsigned long long *dividend,
__rem;  \
  })
 
+#endif /* __powerpc64__ */
+
 static int skip_atoi(const char **s)
 {
int i, c;
-- 
1.7.10.4

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev