m68k: remove arch specific non-optimized memcmp() (f9d693d2) · Commits · 戴 / test

The m68k arch implements its own memcmp() function. It is not optimized in any way (it is the most strait forward coding of memcmp you can get). Remove it and use the kernels standard memcmp() implementation. This also goes part of the way to fixing a regression caused by commit ("m68k/m68knommu: merge MMU and non-MMU string.h"), which breaks non-coldfire non-mmu builds (which is the 68x328 and 68360 families). They currently have no memcmp() function defined, since there is none in the m68knommu/lib functions. Signed-off-by:

Greg Ungerer <gerg@uclinux.org> Acked-by:

Geert Uytterhoeven <geert@linux-m68k.org>

arch/m68k/include/asm/string.h

+1 −3

Original line number	Diff line number	Diff line
		@@ -102,11 +102,9 @@ static inline int strcmp(const char cs, const char ct)

		#define __HAVE_ARCH_MEMMOVE
		extern void memmove(void , const void *, __kernel_size_t);
		#endif /* CONFIG_COLDFIRE */

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

Admin message