diff --git a/[refs] b/[refs]
index 5fb9db36a236..a19042913383 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d46f3d86fdc9248b4a8497a7da229812a15ba670
+refs/heads/master: c3a5ce0416b6c172a23bc8a3760d8704d3d1535b
diff --git a/trunk/include/linux/string.h b/trunk/include/linux/string.h
index ffe0442e18d2..b9178812d9df 100644
--- a/trunk/include/linux/string.h
+++ b/trunk/include/linux/string.h
@@ -144,8 +144,8 @@ static inline bool strstarts(const char *str, const char *prefix)
 {
 	return strncmp(str, prefix, strlen(prefix)) == 0;
 }
-#endif
 
 extern size_t memweight(const void *ptr, size_t bytes);
 
+#endif /* __KERNEL__ */
 #endif /* _LINUX_STRING_H_ */