diff options
Diffstat (limited to 'include/linux/string.h')
-rw-r--r-- | include/linux/string.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/string.h b/include/linux/string.h index b9178812d9df..630125818ca8 100644 --- a/include/linux/string.h +++ b/include/linux/string.h | |||
@@ -1,16 +1,12 @@ | |||
1 | #ifndef _LINUX_STRING_H_ | 1 | #ifndef _LINUX_STRING_H_ |
2 | #define _LINUX_STRING_H_ | 2 | #define _LINUX_STRING_H_ |
3 | 3 | ||
4 | /* We don't want strings.h stuff being used by user stuff by accident */ | ||
5 | |||
6 | #ifndef __KERNEL__ | ||
7 | #include <string.h> | ||
8 | #else | ||
9 | 4 | ||
10 | #include <linux/compiler.h> /* for inline */ | 5 | #include <linux/compiler.h> /* for inline */ |
11 | #include <linux/types.h> /* for size_t */ | 6 | #include <linux/types.h> /* for size_t */ |
12 | #include <linux/stddef.h> /* for NULL */ | 7 | #include <linux/stddef.h> /* for NULL */ |
13 | #include <stdarg.h> | 8 | #include <stdarg.h> |
9 | #include <uapi/linux/string.h> | ||
14 | 10 | ||
15 | extern char *strndup_user(const char __user *, long); | 11 | extern char *strndup_user(const char __user *, long); |
16 | extern void *memdup_user(const void __user *, size_t); | 12 | extern void *memdup_user(const void __user *, size_t); |
@@ -147,5 +143,4 @@ static inline bool strstarts(const char *str, const char *prefix) | |||
147 | 143 | ||
148 | extern size_t memweight(const void *ptr, size_t bytes); | 144 | extern size_t memweight(const void *ptr, size_t bytes); |
149 | 145 | ||
150 | #endif /* __KERNEL__ */ | ||
151 | #endif /* _LINUX_STRING_H_ */ | 146 | #endif /* _LINUX_STRING_H_ */ |