1 files changed, 6 insertions, 16 deletions

diff --git a/include/linux/string.h b/include/linux/string.h
index ac889c5ea11..a176db2f2c8 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -1,12 +1,16 @@
 #ifndef _LINUX_STRING_H_
 #define _LINUX_STRING_H_
 
+/* We don't want strings.h stuff being used by user stuff by accident */
+
+#ifndef __KERNEL__
+#include <string.h>
+#else
 
 #include <linux/compiler.h>     /* for inline */
 #include <linux/types.h>        /* for size_t */
 #include <linux/stddef.h>       /* for NULL */
 #include <stdarg.h>
-#include <uapi/linux/string.h>
 
 extern char *strndup_user(const char __user *, long);
 extern void *memdup_user(const void __user *, size_t);
@@ -110,7 +114,6 @@ extern int memcmp(const void *,const void *,__kernel_size_t);
 #ifndef __HAVE_ARCH_MEMCHR
 extern void * memchr(const void *,int,__kernel_size_t);
 #endif
-void *memchr_inv(const void *s, int c, size_t n);
 
 extern char *kstrdup(const char *s, gfp_t gfp);
 extern char *kstrndup(const char *s, size_t len, gfp_t gfp);
@@ -140,18 +143,5 @@ static inline bool strstarts(const char *str, const char *prefix)
 {
         return strncmp(str, prefix, strlen(prefix)) == 0;
 }
-
-extern size_t memweight(const void *ptr, size_t bytes);
-
-/**
- * kbasename - return the last part of a pathname.
- *
- * @path: path to extract the filename from.
- */
-static inline const char *kbasename(const char *path)
-{
-        const char *tail = strrchr(path, '/');
-        return tail ? tail + 1 : path;
-}
-
+#endif
 #endif /* _LINUX_STRING_H_ */