From e00c73ee05dc38ecaccced55d4f5fc58b0b769f7 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Wed, 10 Apr 2013 16:45:21 +0200 Subject: m68k: Remove inline strlen() implementation GCC can replace a strncat() call with constant second argument into a strlen + store, which results in a link error: ERROR: "strlen" [net/ipv4/ip_tunnel.ko] undefined! The inline function is a simple for loop in C. Other architectures either use an asm optimized variant, or use the generic function from lib/string.c. Reported-by: Geert Uytterhoeven Signed-off-by: Michal Marek Signed-off-by: Geert Uytterhoeven --- arch/m68k/lib/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/m68k/lib') diff --git a/arch/m68k/lib/string.c b/arch/m68k/lib/string.c index b9a57abfad0..4d61fa8a112 100644 --- a/arch/m68k/lib/string.c +++ b/arch/m68k/lib/string.c @@ -17,6 +17,6 @@ EXPORT_SYMBOL(strcpy); char *strcat(char *dest, const char *src) { - return __kernel_strcpy(dest + __kernel_strlen(dest), src); + return __kernel_strcpy(dest + strlen(dest), src); } EXPORT_SYMBOL(strcat); -- cgit v1.2.3