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

Commit 048f039f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: set flow handler for secondary interrupt controller of 5249
  m68knommu: remove use of IRQ_FLG_LOCK from 68360 platform support
  m68knommu: fix dereference of port.tty
  m68knommu: add missing linker __modver section
  m68knommu: fix mis-named variable int set_irq_chip loop
  m68knommu: add optimize memmove() function
  m68k: remove arch specific non-optimized memcmp()
  m68knommu: fix use of un-defined _TIF_WORK_MASK
  m68knommu: Rename m548x_wdt.c to m54xx_wdt.c
  m68knommu: fix m548x_wdt.c compilation after headers renaming
  m68knommu: Remove dependencies on nonexistent M68KNOMMU
parents b90be866 86d306c9

arch/m68k/include/asm/string.h

+1 −3
Original line number Diff line number Diff line
@@ -99,14 +99,12 @@ static inline int strcmp(const char *cs, const char *ct) 
		: "+a" (cs), "+a" (ct), "=d" (res));

	return res;

}

#endif /* CONFIG_COLDFIRE */



#define __HAVE_ARCH_MEMMOVE

extern void *memmove(void *, const void *, __kernel_size_t);



#define __HAVE_ARCH_MEMCMP

extern int memcmp(const void *, const void *, __kernel_size_t);

#define memcmp(d, s, n) __builtin_memcmp(d, s, n)

#endif /* CONFIG_COLDFIRE */



#define __HAVE_ARCH_MEMSET

extern void *memset(void *, int, __kernel_size_t);

arch/m68k/lib/string.c

+0 −11
Original line number Diff line number Diff line
@@ -243,14 +243,3 @@ void *memmove(void *dest, const void *src, size_t n) 
	return xdest;

}

EXPORT_SYMBOL(memmove);
 


int memcmp(const void *cs, const void *ct, size_t count)

{

	const unsigned char *su1, *su2;



	for (su1 = cs, su2 = ct; count > 0; ++su1, ++su2, count--)

		if (*su1 != *su2)

			return *su1 < *su2 ? -1 : +1;

	return 0;

}

EXPORT_SYMBOL(memcmp);

arch/m68knommu/kernel/vmlinux.lds.S

+6 −0
Original line number Diff line number Diff line
@@ -141,6 +141,12 @@ SECTIONS { 
		*(__param)

		__stop___param = .;



		/* Built-in module versions */

		. = ALIGN(4) ;

		__start___modver = .;

		*(__modver)

		__stop___modver = .;



		. = ALIGN(4) ;

		_etext = . ;

	} > TEXT

arch/m68knommu/lib/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,4 +4,4 @@ 


lib-y	:= ashldi3.o ashrdi3.o lshrdi3.o \

	   muldi3.o mulsi3.o divsi3.o udivsi3.o modsi3.o umodsi3.o \

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

arch/m68knommu/lib/memmove.c

0 → 100644
+105 −0
Original line number Diff line number Diff line 
/*

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file COPYING in the main directory of this archive

 * for more details.

 */



#define __IN_STRING_C



#include <linux/module.h>

#include <linux/string.h>



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);