m68k: remove duplicate memcpy() implementation

Merging the mmu and non-mmu directories we ended up with duplicate
implementations of memcpy(). One is a little more optimized for the
>= 68020 case, but that can easily be inserted into a single
implementation of memcpy(). Clean up the exporting of this symbol
too, otherwise we end up exporting it twice on a no-mmu build.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

1 files changed, 0 insertions, 67 deletions

diff --git a/arch/m68k/lib/string.c b/arch/m68k/lib/string.c
index 6d2461237a16..b9a57abfad08 100644
--- a/arch/m68k/lib/string.c
+++ b/arch/m68k/lib/string.c
@@ -20,70 +20,3 @@ char *strcat(char *dest, const char *src)
         return __kernel_strcpy(dest + __kernel_strlen(dest), src);
 }
 EXPORT_SYMBOL(strcat);
-
-void *memcpy(void *to, const void *from, size_t n)
-{
-        void *xto = to;
-        size_t temp, temp1;
-
-        if (!n)
-                return xto;
-        if ((long)to & 1) {
-                char *cto = to;
-                const char *cfrom = from;
-                *cto++ = *cfrom++;
-                to = cto;
-                from = cfrom;
-                n--;
-        }
-        if (n > 2 && (long)to & 2) {
-                short *sto = to;
-                const short *sfrom = from;
-                *sto++ = *sfrom++;
-                to = sto;
-                from = sfrom;
-                n -= 2;
-        }
-        temp = n >> 2;
-        if (temp) {
-                long *lto = to;
-                const long *lfrom = from;
-
-                asm volatile (
-                        "       movel %2,%3\n"
-                        "       andw  #7,%3\n"
-                        "       lsrl  #3,%2\n"
-                        "       negw  %3\n"
-                        "       jmp   %%pc@(1f,%3:w:2)\n"
-                        "4:     movel %0@+,%1@+\n"
-                        "       movel %0@+,%1@+\n"
-                        "       movel %0@+,%1@+\n"
-                        "       movel %0@+,%1@+\n"
-                        "       movel %0@+,%1@+\n"
-                        "       movel %0@+,%1@+\n"
-                        "       movel %0@+,%1@+\n"
-                        "       movel %0@+,%1@+\n"
-                        "1:     dbra  %2,4b\n"
-                        "       clrw  %2\n"
-                        "       subql #1,%2\n"
-                        "       jpl   4b"
-                        : "=a" (lfrom), "=a" (lto), "=d" (temp), "=&d" (temp1)
-                        : "0" (lfrom), "1" (lto), "2" (temp));
-                to = lto;
-                from = lfrom;
-        }
-        if (n & 2) {
-                short *sto = to;
-                const short *sfrom = from;
-                *sto++ = *sfrom++;
-                to = sto;
-                from = sfrom;
-        }
-        if (n & 1) {
-                char *cto = to;
-                const char *cfrom = from;
-                *cto = *cfrom;
-        }
-        return xto;
-}
-EXPORT_SYMBOL(memcpy);