sh: Correct __xdiv64_32/div64_32 return value size.

These should be returning a uint32_t, whereas they were erroneously
returning a u64 before. As the register sizes are 32-bits, this doesn't
really make a lot of sense.

Reported-by: Katsuya MATSUBARA <matsu@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/lib/div64-generic.c b/arch/sh/lib/div64-generic.c
index c02473afd5814c9ca0a6da331b3d1db4623f4c14..d9482cd2a9ea0f8586a2beecacdd3a525f40ea38 100644 (file)
--- a/arch/sh/lib/div64-generic.c
+++ b/arch/sh/lib/div64-generic.c
@@ -4,16 +4,15 @@
 
 #include <linux/types.h>
 
-extern u64 __xdiv64_32(u64 n, u32 d);
+extern uint32_t __xdiv64_32(u64 n, u32 d);
 
-u64 __div64_32(u64 *xp, u32 y)
+uint32_t __div64_32(u64 *xp, u32 y)
 {
-       u64 rem;
-       u64 q = __xdiv64_32(*xp, y);
+       uint32_t rem;
+       uint32_t q = __xdiv64_32(*xp, y);
 
        rem = *xp - q * y;
        *xp = q;
 
        return rem;
 }
-

diff --git a/arch/sh/lib/div64.S b/arch/sh/lib/div64.S
index eefc275d64a76135d4f8295f658a6673b9f2a318..5ee7334ea64ff7ff4e68a32f24a5161c8f195a71 100644 (file)
--- a/arch/sh/lib/div64.S
+++ b/arch/sh/lib/div64.S
@@ -1,12 +1,12 @@
 /*     
- * unsigned long long __xdiv64_32(unsigned long long n, unsigned long d); 
+ * unsigned long __xdiv64_32(unsigned long long n, unsigned long d); 
  */
 
 #include <linux/linkage.h>
 
 .text
 ENTRY(__xdiv64_32)
-#ifdef  __LITTLE_ENDIAN__
+#ifdef CONFIG_CPU_LITTLE_ENDIAN
        mov     r4, r0
        mov     r5, r1
 #else
@@ -34,7 +34,7 @@ ENTRY(__xdiv64_32)
        rotcl   r0
        div1    r6, r1
        .endr
-#ifdef  __LITTLE_ENDIAN__
+#ifdef CONFIG_CPU_LITTLE_ENDIAN
        mov     r2, r1
        rts
         rotcl  r0