From: Al Viro <viro@ftp.linux.org.uk>
Date: Wed, 21 May 2008 05:32:11 +0000 (+0100)
Subject: provide out-of-line strcat() for m68k
X-Git-Tag: v2.6.26-rc4~73
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=337e3c48e95e071a6ec1bfe95b55325e97f4908e;p=linux-2.6-omap-h63xx.git

provide out-of-line strcat() for m68k

Whether we sidestep it in init/main.c or not, such situations
will arise again; compiler does generate calls of strcat()
on optimizations, so we really ought to have an out-of-line
version...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/arch/m68k/lib/string.c b/arch/m68k/lib/string.c
index 891e1347bc4..4253f870e54 100644
--- a/arch/m68k/lib/string.c
+++ b/arch/m68k/lib/string.c
@@ -15,6 +15,12 @@ char *strcpy(char *dest, const char *src)
 }
 EXPORT_SYMBOL(strcpy);
 
+char *strcat(char *dest, const char *src)
+{
+	return __kernel_strcpy(dest + __kernel_strlen(dest), src);
+}
+EXPORT_SYMBOL(strcat);
+
 void *memset(void *s, int c, size_t count)
 {
 	void *xs = s;