Merge tag 'disintegrate-main-20121013' of git://git.infradead.org/users/dhowells...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / linux / string.h

diff --git a/include/linux/string.h b/include/linux/string.h
index ffe0442e18d2f4e2d7b8d8eb8f22ffbc532e67e4..630125818ca8177c5a90a8600e20cfc053e9fca6 100644 (file)
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -1,16 +1,12 @@
 #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);
@@ -144,7 +140,6 @@ 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);