diff options
Diffstat (limited to 'include/asm-x86_64/uaccess.h')
-rw-r--r-- | include/asm-x86_64/uaccess.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86_64/uaccess.h b/include/asm-x86_64/uaccess.h index 1e1fa003daa3..bc6812009bd7 100644 --- a/include/asm-x86_64/uaccess.h +++ b/include/asm-x86_64/uaccess.h | |||
@@ -238,6 +238,7 @@ do { \ | |||
238 | 238 | ||
239 | /* Handles exceptions in both to and from, but doesn't do access_ok */ | 239 | /* Handles exceptions in both to and from, but doesn't do access_ok */ |
240 | extern unsigned long copy_user_generic(void *to, const void *from, unsigned len); | 240 | extern unsigned long copy_user_generic(void *to, const void *from, unsigned len); |
241 | extern unsigned long copy_user_generic_dontzero(void *to, const void *from, unsigned len); | ||
241 | 242 | ||
242 | extern unsigned long copy_to_user(void __user *to, const void *from, unsigned len); | 243 | extern unsigned long copy_to_user(void __user *to, const void *from, unsigned len); |
243 | extern unsigned long copy_from_user(void *to, const void __user *from, unsigned len); | 244 | extern unsigned long copy_from_user(void *to, const void __user *from, unsigned len); |
@@ -303,7 +304,6 @@ static __always_inline int __copy_to_user(void __user *dst, const void *src, uns | |||
303 | } | 304 | } |
304 | } | 305 | } |
305 | 306 | ||
306 | |||
307 | static __always_inline int __copy_in_user(void __user *dst, const void __user *src, unsigned size) | 307 | static __always_inline int __copy_in_user(void __user *dst, const void __user *src, unsigned size) |
308 | { | 308 | { |
309 | int ret = 0; | 309 | int ret = 0; |
@@ -352,7 +352,7 @@ long strlen_user(const char __user *str); | |||
352 | unsigned long clear_user(void __user *mem, unsigned long len); | 352 | unsigned long clear_user(void __user *mem, unsigned long len); |
353 | unsigned long __clear_user(void __user *mem, unsigned long len); | 353 | unsigned long __clear_user(void __user *mem, unsigned long len); |
354 | 354 | ||
355 | #define __copy_to_user_inatomic __copy_to_user | 355 | extern long __copy_from_user_inatomic(void *dst, const void __user *src, unsigned size); |
356 | #define __copy_from_user_inatomic __copy_from_user | 356 | #define __copy_to_user_inatomic copy_user_generic |
357 | 357 | ||
358 | #endif /* __X86_64_UACCESS_H */ | 358 | #endif /* __X86_64_UACCESS_H */ |