Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80160de8 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68k: remove duplicate memmove() implementation 



Merging the mmu and non-mmu directories we ended up with duplicate
(and identical) implementations of memmove(). Remove one of them.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent b82ed87e

arch/m68k/lib/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -3,12 +3,12 @@ 
# Makefile for m68k-specific library files..

#



lib-y	:= ashldi3.o ashrdi3.o lshrdi3.o muldi3.o checksum.o

lib-y	:= ashldi3.o ashrdi3.o lshrdi3.o muldi3.o memmove.o checksum.o



ifdef CONFIG_MMU

lib-y	+= string.o uaccess.o

else

lib-y	+= mulsi3.o divsi3.o udivsi3.o modsi3.o umodsi3.o \

	   memcpy.o memmove.o memset.o delay.o

	   memcpy.o memset.o delay.o

endif

arch/m68k/lib/memmove.c

+0 −2
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ 
 * for more details.

 */



#define __IN_STRING_C



#include <linux/module.h>

#include <linux/string.h>

arch/m68k/lib/string.c

+0 −95
Original line number Diff line number Diff line
@@ -148,98 +148,3 @@ void *memcpy(void *to, const void *from, size_t n) 
	return xto;

}

EXPORT_SYMBOL(memcpy);
 


void *memmove(void *dest, const void *src, size_t n)

{

	void *xdest = dest;

	size_t temp;



	if (!n)

		return xdest;



	if (dest < src) {

		if ((long)dest & 1) {

			char *cdest = dest;

			const char *csrc = src;

			*cdest++ = *csrc++;

			dest = cdest;

			src = csrc;

			n--;

		}

		if (n > 2 && (long)dest & 2) {

			short *sdest = dest;

			const short *ssrc = src;

			*sdest++ = *ssrc++;

			dest = sdest;

			src = ssrc;

			n -= 2;

		}

		temp = n >> 2;

		if (temp) {

			long *ldest = dest;

			const long *lsrc = src;

			temp--;

			do

				*ldest++ = *lsrc++;

			while (temp--);

			dest = ldest;

			src = lsrc;

		}

		if (n & 2) {

			short *sdest = dest;

			const short *ssrc = src;

			*sdest++ = *ssrc++;

			dest = sdest;

			src = ssrc;

		}

		if (n & 1) {

			char *cdest = dest;

			const char *csrc = src;

			*cdest = *csrc;

		}

	} else {

		dest = (char *)dest + n;

		src = (const char *)src + n;

		if ((long)dest & 1) {

			char *cdest = dest;

			const char *csrc = src;

			*--cdest = *--csrc;

			dest = cdest;

			src = csrc;

			n--;

		}

		if (n > 2 && (long)dest & 2) {

			short *sdest = dest;

			const short *ssrc = src;

			*--sdest = *--ssrc;

			dest = sdest;

			src = ssrc;

			n -= 2;

		}

		temp = n >> 2;

		if (temp) {

			long *ldest = dest;

			const long *lsrc = src;

			temp--;

			do

				*--ldest = *--lsrc;

			while (temp--);

			dest = ldest;

			src = lsrc;

		}

		if (n & 2) {

			short *sdest = dest;

			const short *ssrc = src;

			*--sdest = *--ssrc;

			dest = sdest;

			src = ssrc;

		}

		if (n & 1) {

			char *cdest = dest;

			const char *csrc = src;

			*--cdest = *--csrc;

		}

	}

	return xdest;

}

EXPORT_SYMBOL(memmove);