aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-03-28 04:14:45 -0400
committerPaul Mundt <lethal@hera.kernel.org>2007-05-06 22:11:55 -0400
commitcdf50b23bf83624708d0abbb381a1c1694e42e19 (patch)
tree88c439ae3f3e679b98adc19fe18cb9286299c64e /arch
parent01066625e9ae39742c92e21163f7f2a818e02762 (diff)
sh: Kill off udivdi3 div64_32 wrapping.
Previously we've been handling udivdi3 references and wrapping them in to div64_32() automatically. This doesn't get a lot of use, however, and as akpm noted in the recent thread on l-k: http://lkml.org/lkml/2007/2/27/241 we're better off simply ripping it out and going the do_div() route if there happen to be any places that need it. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/kernel/sh_ksyms.c1
-rw-r--r--arch/sh/lib/Makefile4
-rw-r--r--arch/sh/lib/udivdi3.c16
3 files changed, 1 insertions, 20 deletions
diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms.c
index 6e0d10fac4a8..17f0b50c5678 100644
--- a/arch/sh/kernel/sh_ksyms.c
+++ b/arch/sh/kernel/sh_ksyms.c
@@ -65,7 +65,6 @@ EXPORT_SYMBOL(__div64_32);
65 65
66/* These symbols are generated by the compiler itself */ 66/* These symbols are generated by the compiler itself */
67DECLARE_EXPORT(__udivsi3); 67DECLARE_EXPORT(__udivsi3);
68DECLARE_EXPORT(__udivdi3);
69DECLARE_EXPORT(__sdivsi3); 68DECLARE_EXPORT(__sdivsi3);
70DECLARE_EXPORT(__ashrdi3); 69DECLARE_EXPORT(__ashrdi3);
71DECLARE_EXPORT(__ashldi3); 70DECLARE_EXPORT(__ashldi3);
diff --git a/arch/sh/lib/Makefile b/arch/sh/lib/Makefile
index 0b9cca5c7cb4..e23dd1a3fccd 100644
--- a/arch/sh/lib/Makefile
+++ b/arch/sh/lib/Makefile
@@ -3,11 +3,9 @@
3# 3#
4 4
5lib-y = delay.o memset.o memmove.o memchr.o \ 5lib-y = delay.o memset.o memmove.o memchr.o \
6 checksum.o strlen.o div64.o udivdi3.o \ 6 checksum.o strlen.o div64.o div64-generic.o
7 div64-generic.o
8 7
9memcpy-y := memcpy.o 8memcpy-y := memcpy.o
10memcpy-$(CONFIG_CPU_SH4) := memcpy-sh4.o 9memcpy-$(CONFIG_CPU_SH4) := memcpy-sh4.o
11 10
12lib-y += $(memcpy-y) 11lib-y += $(memcpy-y)
13
diff --git a/arch/sh/lib/udivdi3.c b/arch/sh/lib/udivdi3.c
deleted file mode 100644
index 68f038bf3c50..000000000000
--- a/arch/sh/lib/udivdi3.c
+++ /dev/null
@@ -1,16 +0,0 @@
1/*
2 * Simple __udivdi3 function which doesn't use FPU.
3 */
4
5#include <linux/types.h>
6
7extern u64 __xdiv64_32(u64 n, u32 d);
8extern void panic(const char * fmt, ...);
9
10u64 __udivdi3(u64 n, u64 d)
11{
12 if (d & ~0xffffffff)
13 panic("Need true 64-bit/64-bit division");
14 return __xdiv64_32(n, (u32)d);
15}
16