1 files changed, 0 insertions, 131 deletions
diff --git a/arch/m68k/include/asm/string_mm.h b/arch/m68k/include/asm/string_mm.h
deleted file mode 100644
index 2eb7df1e0f5d..000000000000
--- a/arch/m68k/include/asm/string_mm.h
+++ /dev/null
@@ -1,131 +0,0 @@
-#ifndef _M68K_STRING_H_
-#define _M68K_STRING_H_
-#include <linux/types.h>
-#include <linux/compiler.h>
-static inline size_t __kernel_strlen(const char *s)
-{
-        const char *sc;
-        for (sc = s; *sc++; )
-                ;
-        return sc - s - 1;
-}
-static inline char *__kernel_strcpy(char *dest, const char *src)
-{
-        char *xdest = dest;
-        asm volatile ("\n"
-                "1:     move.b  (%1)+,(%0)+\n"
-                "       jne     1b"
-                : "+a" (dest), "+a" (src)
-                : : "memory");
-        return xdest;
-}
-#ifndef __IN_STRING_C
-#define __HAVE_ARCH_STRLEN
-#define strlen(s)       (__builtin_constant_p(s) ?      \
-                         __builtin_strlen(s) :          \
-                         __kernel_strlen(s))
-#define __HAVE_ARCH_STRNLEN
-static inline size_t strnlen(const char *s, size_t count)
-{
-        const char *sc = s;
-        asm volatile ("\n"
-                "1:     subq.l  #1,%1\n"
-                "       jcs     2f\n"
-                "       tst.b   (%0)+\n"
-                "       jne     1b\n"
-                "       subq.l  #1,%0\n"
-                "2:"
-                : "+a" (sc), "+d" (count));
-        return sc - s;
-}
-#define __HAVE_ARCH_STRCPY
-#if __GNUC__ >= 4
-#define strcpy(d, s)    (__builtin_constant_p(s) &&     \
-                         __builtin_strlen(s) <= 32 ?    \
-                         __builtin_strcpy(d, s) :       \
-                         __kernel_strcpy(d, s))
-#else
-#define strcpy(d, s)    __kernel_strcpy(d, s)
-#endif
-#define __HAVE_ARCH_STRNCPY
-static inline char *strncpy(char *dest, const char *src, size_t n)
-{
-        char *xdest = dest;
-        asm volatile ("\n"
-                "       jra     2f\n"
-                "1:     move.b  (%1),(%0)+\n"
-                "       jeq     2f\n"
-                "       addq.l  #1,%1\n"
-                "2:     subq.l  #1,%2\n"
-                "       jcc     1b\n"
-                : "+a" (dest), "+a" (src), "+d" (n)
-                : : "memory");
-        return xdest;
-}
-#define __HAVE_ARCH_STRCAT
-#define strcat(d, s)    ({                      \
-        char *__d = (d);                        \
-        strcpy(__d + strlen(__d), (s));         \
-})
-#define __HAVE_ARCH_STRCHR
-static inline char *strchr(const char *s, int c)
-{
-        char sc, ch = c;
-        for (; (sc = *s++) != ch; ) {
-                if (!sc)
-                        return NULL;
-        }
-        return (char *)s - 1;
-}
-#define __HAVE_ARCH_STRCMP
-static inline int strcmp(const char *cs, const char *ct)
-{
-        char res;
-        asm ("\n"
-                "1:     move.b  (%0)+,%2\n"     /* get *cs */
-                "       cmp.b   (%1)+,%2\n"     /* compare a byte */
-                "       jne     2f\n"           /* not equal, break out */
-                "       tst.b   %2\n"           /* at end of cs? */
-                "       jne     1b\n"           /* no, keep going */
-                "       jra     3f\n"           /* strings are equal */
-                "2:     sub.b   -(%1),%2\n"     /* *cs - *ct */
-                "3:"
-                : "+a" (cs), "+a" (ct), "=d" (res));
-        return res;
-}
-#define __HAVE_ARCH_MEMSET
-extern void *memset(void *, int, __kernel_size_t);
-#define memset(d, c, n) __builtin_memset(d, c, n)
-#define __HAVE_ARCH_MEMCPY
-extern void *memcpy(void *, const void *, __kernel_size_t);
-#define memcpy(d, s, n) __builtin_memcpy(d, s, n)
-#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
-#endif /* _M68K_STRING_H_ */

diff --git a/arch/m68k/include/asm/string_mm.h b/arch/m68k/include/asm/string_mm.h deleted file mode 100644 index 2eb7df1e0f5d..000000000000 --- a/arch/m68k/include/asm/string_mm.h +++ /dev/null
@@ -1,131 +0,0 @@
1	#ifndef _M68K_STRING_H_
2	#define _M68K_STRING_H_
3
4	#include <linux/types.h>
5	#include <linux/compiler.h>
6
7	static inline size_t __kernel_strlen(const char *s)
8	{
9	const char *sc;
10
11	for (sc = s; *sc++; )
12	;
13	return sc - s - 1;
14	}
15
16	static inline char __kernel_strcpy(char dest, const char *src)
17	{
18	char *xdest = dest;
19
20	asm volatile ("\n"
21	"1: move.b (%1)+,(%0)+\n"
22	" jne 1b"
23	: "+a" (dest), "+a" (src)
24	: : "memory");
25	return xdest;
26	}
27
28	#ifndef __IN_STRING_C
29
30	#define __HAVE_ARCH_STRLEN
31	#define strlen(s) (__builtin_constant_p(s) ? \
32	__builtin_strlen(s) : \
33	__kernel_strlen(s))
34
35	#define __HAVE_ARCH_STRNLEN
36	static inline size_t strnlen(const char *s, size_t count)
37	{
38	const char *sc = s;
39
40	asm volatile ("\n"
41	"1: subq.l #1,%1\n"
42	" jcs 2f\n"
43	" tst.b (%0)+\n"
44	" jne 1b\n"
45	" subq.l #1,%0\n"
46	"2:"
47	: "+a" (sc), "+d" (count));
48	return sc - s;
49	}
50
51	#define __HAVE_ARCH_STRCPY
52	#if __GNUC__ >= 4
53	#define strcpy(d, s) (__builtin_constant_p(s) && \
54	__builtin_strlen(s) <= 32 ? \
55	__builtin_strcpy(d, s) : \
56	__kernel_strcpy(d, s))
57	#else
58	#define strcpy(d, s) __kernel_strcpy(d, s)
59	#endif
60
61	#define __HAVE_ARCH_STRNCPY
62	static inline char strncpy(char dest, const char *src, size_t n)
63	{
64	char *xdest = dest;
65
66	asm volatile ("\n"
67	" jra 2f\n"
68	"1: move.b (%1),(%0)+\n"
69	" jeq 2f\n"
70	" addq.l #1,%1\n"
71	"2: subq.l #1,%2\n"
72	" jcc 1b\n"
73	: "+a" (dest), "+a" (src), "+d" (n)
74	: : "memory");
75	return xdest;
76	}
77
78	#define __HAVE_ARCH_STRCAT
79	#define strcat(d, s) ({ \
80	char *__d = (d); \
81	strcpy(__d + strlen(__d), (s)); \
82	})
83
84	#define __HAVE_ARCH_STRCHR
85	static inline char strchr(const char s, int c)
86	{
87	char sc, ch = c;
88
89	for (; (sc = *s++) != ch; ) {
90	if (!sc)
91	return NULL;
92	}
93	return (char *)s - 1;
94	}
95
96	#define __HAVE_ARCH_STRCMP
97	static inline int strcmp(const char cs, const char ct)
98	{
99	char res;
100
101	asm ("\n"
102	"1: move.b (%0)+,%2\n" /* get cs /
103	" cmp.b (%1)+,%2\n" /* compare a byte */
104	" jne 2f\n" /* not equal, break out */
105	" tst.b %2\n" /* at end of cs? */
106	" jne 1b\n" /* no, keep going */
107	" jra 3f\n" /* strings are equal */
108	"2: sub.b -(%1),%2\n" /* cs - ct */
109	"3:"
110	: "+a" (cs), "+a" (ct), "=d" (res));
111	return res;
112	}
113
114	#define __HAVE_ARCH_MEMSET
115	extern void memset(void , int, __kernel_size_t);
116	#define memset(d, c, n) __builtin_memset(d, c, n)
117
118	#define __HAVE_ARCH_MEMCPY
119	extern void memcpy(void , const void *, __kernel_size_t);
120	#define memcpy(d, s, n) __builtin_memcpy(d, s, n)
121
122	#define __HAVE_ARCH_MEMMOVE
123	extern void memmove(void , const void *, __kernel_size_t);
124
125	#define __HAVE_ARCH_MEMCMP
126	extern int memcmp(const void , const void , __kernel_size_t);
127	#define memcmp(d, s, n) __builtin_memcmp(d, s, n)
128
129	#endif
130
131	#endif /* _M68K_STRING_H_ */