Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sh: Correct __xdiv64_32/div64_32 return value size.

Browse source 
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>
This commit is contained in:
Paul Mundt 2007-07-06 10:58:04 +09:00
parent 75f016a7ce
commit 04c7d9579f
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/sh/lib/div64-generic.c
View file

@ -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;
}

6
arch/sh/lib/div64.S
View file

@ -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