diff --git a/[refs] b/[refs]
index addc549aa4aa..260d07801688 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c8a08d7a74b07ab2c47e259231d9d0f0047a3c1
+refs/heads/master: 6faf250789dfd35146a71402f9be245be82bf01e
diff --git a/trunk/arch/s390/include/asm/string.h b/trunk/arch/s390/include/asm/string.h
index d074673a6d9b..adf079170aa6 100644
--- a/trunk/arch/s390/include/asm/string.h
+++ b/trunk/arch/s390/include/asm/string.h
@@ -135,7 +135,13 @@ static inline size_t strnlen(const char * s, size_t n)
 		: "+a" (end), "+a" (tmp) : "d" (r0)  : "cc");
 	return end - s;
 }
-
+#else /* IN_ARCH_STRING_C */
+void *memchr(const void * s, int c, size_t n);
+void *memscan(void *s, int c, size_t n);
+char *strcat(char *dst, const char *src);
+char *strcpy(char *dst, const char *src);
+size_t strlen(const char *s);
+size_t strnlen(const char * s, size_t n);
 #endif /* !IN_ARCH_STRING_C */
 
 #endif /* __KERNEL__ */