Commit 04c7d957 authored by Paul Mundt's avatar Paul Mundt

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: default avatarKatsuya MATSUBARA <matsu@igel.co.jp>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 75f016a7
...@@ -4,16 +4,15 @@ ...@@ -4,16 +4,15 @@
#include <linux/types.h> #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; uint32_t rem;
u64 q = __xdiv64_32(*xp, y); uint32_t q = __xdiv64_32(*xp, y);
rem = *xp - q * y; rem = *xp - q * y;
*xp = q; *xp = q;
return rem; return rem;
} }
/* /*
* 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> #include <linux/linkage.h>
.text .text
ENTRY(__xdiv64_32) ENTRY(__xdiv64_32)
#ifdef __LITTLE_ENDIAN__ #ifdef CONFIG_CPU_LITTLE_ENDIAN
mov r4, r0 mov r4, r0
mov r5, r1 mov r5, r1
#else #else
...@@ -34,7 +34,7 @@ ENTRY(__xdiv64_32) ...@@ -34,7 +34,7 @@ ENTRY(__xdiv64_32)
rotcl r0 rotcl r0
div1 r6, r1 div1 r6, r1
.endr .endr
#ifdef __LITTLE_ENDIAN__ #ifdef CONFIG_CPU_LITTLE_ENDIAN
mov r2, r1 mov r2, r1
rts rts
rotcl r0 rotcl r0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment