diff --git a/[refs] b/[refs]
index 059348b0997b..bf867f645291 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b74e3abb3e9bd8a2f52a7b653941e3686c5df1a
+refs/heads/master: aac57f81eb16d56afb5bd5a31ff325b5d1615580
diff --git a/trunk/include/asm-x86_64/string.h b/trunk/include/asm-x86_64/string.h
index 9505d9f4bead..e583da7918fb 100644
--- a/trunk/include/asm-x86_64/string.h
+++ b/trunk/include/asm-x86_64/string.h
@@ -29,6 +29,9 @@ return (to);
    function. */
 
 #define __HAVE_ARCH_MEMCPY 1
+#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4
+extern void *memcpy(void *to, const void *from, size_t len);
+#else
 extern void *__memcpy(void *to, const void *from, size_t len); 
 #define memcpy(dst,src,len) \
 	({ size_t __len = (len);				\
@@ -38,7 +41,7 @@ extern void *__memcpy(void *to, const void *from, size_t len);
 	   else							\
 		 __ret = __builtin_memcpy((dst),(src),__len);	\
 	   __ret; }) 
-
+#endif
 
 #define __HAVE_ARCH_MEMSET
 void *memset(void *s, int c, size_t n);