From f60278913773fcdb5f2829cbf0201f15837103a0 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Wed, 28 Mar 2007 17:14:45 +0900 Subject: [PATCH] --- yaml --- r: 54357 b: refs/heads/master c: cdf50b23bf83624708d0abbb381a1c1694e42e19 h: refs/heads/master i: 54355: 79c1b1804aad796b30bb53c5d04566d48ad2b9a5 v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/sh_ksyms.c | 1 - trunk/arch/sh/lib/Makefile | 4 +--- trunk/arch/sh/lib/udivdi3.c | 16 ---------------- 4 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 trunk/arch/sh/lib/udivdi3.c diff --git a/[refs] b/[refs] index cfb5d3f110e7..59ddb2a700dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01066625e9ae39742c92e21163f7f2a818e02762 +refs/heads/master: cdf50b23bf83624708d0abbb381a1c1694e42e19 diff --git a/trunk/arch/sh/kernel/sh_ksyms.c b/trunk/arch/sh/kernel/sh_ksyms.c index 6e0d10fac4a8..17f0b50c5678 100644 --- a/trunk/arch/sh/kernel/sh_ksyms.c +++ b/trunk/arch/sh/kernel/sh_ksyms.c @@ -65,7 +65,6 @@ EXPORT_SYMBOL(__div64_32); /* These symbols are generated by the compiler itself */ DECLARE_EXPORT(__udivsi3); -DECLARE_EXPORT(__udivdi3); DECLARE_EXPORT(__sdivsi3); DECLARE_EXPORT(__ashrdi3); DECLARE_EXPORT(__ashldi3); diff --git a/trunk/arch/sh/lib/Makefile b/trunk/arch/sh/lib/Makefile index 0b9cca5c7cb4..e23dd1a3fccd 100644 --- a/trunk/arch/sh/lib/Makefile +++ b/trunk/arch/sh/lib/Makefile @@ -3,11 +3,9 @@ # lib-y = delay.o memset.o memmove.o memchr.o \ - checksum.o strlen.o div64.o udivdi3.o \ - div64-generic.o + checksum.o strlen.o div64.o div64-generic.o memcpy-y := memcpy.o memcpy-$(CONFIG_CPU_SH4) := memcpy-sh4.o lib-y += $(memcpy-y) - diff --git a/trunk/arch/sh/lib/udivdi3.c b/trunk/arch/sh/lib/udivdi3.c deleted file mode 100644 index 68f038bf3c50..000000000000 --- a/trunk/arch/sh/lib/udivdi3.c +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Simple __udivdi3 function which doesn't use FPU. - */ - -#include - -extern u64 __xdiv64_32(u64 n, u32 d); -extern void panic(const char * fmt, ...); - -u64 __udivdi3(u64 n, u64 d) -{ - if (d & ~0xffffffff) - panic("Need true 64-bit/64-bit division"); - return __xdiv64_32(n, (u32)d); -} -