diff --git a/[refs] b/[refs]
index 43e0e54f62ff..c506bdad3217 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f4fdb7fba0b3ec66df39d0e743e701404161fb8
+refs/heads/master: 79121ea9f098934850347eeed3857ffd836810c3
diff --git a/trunk/include/asm-x86_64/string.h b/trunk/include/asm-x86_64/string.h
index ee6bf275349e..9505d9f4bead 100644
--- a/trunk/include/asm-x86_64/string.h
+++ b/trunk/include/asm-x86_64/string.h
@@ -6,7 +6,8 @@
 /* Written 2002 by Andi Kleen */ 
 
 /* Only used for special circumstances. Stolen from i386/string.h */ 
-static inline void * __inline_memcpy(void * to, const void * from, size_t n)
+static __always_inline void *
+__inline_memcpy(void * to, const void * from, size_t n)
 {
 unsigned long d0, d1, d2;
 __asm__ __volatile__(