diff options
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r-- | arch/x86/include/asm/uaccess_64.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h index ce6fec7ce38..7adebacaa32 100644 --- a/arch/x86/include/asm/uaccess_64.h +++ b/arch/x86/include/asm/uaccess_64.h | |||
@@ -193,8 +193,11 @@ __must_check long strlen_user(const char __user *str); | |||
193 | __must_check unsigned long clear_user(void __user *mem, unsigned long len); | 193 | __must_check unsigned long clear_user(void __user *mem, unsigned long len); |
194 | __must_check unsigned long __clear_user(void __user *mem, unsigned long len); | 194 | __must_check unsigned long __clear_user(void __user *mem, unsigned long len); |
195 | 195 | ||
196 | __must_check long __copy_from_user_inatomic(void *dst, const void __user *src, | 196 | static __must_check __always_inline int |
197 | unsigned size); | 197 | __copy_from_user_inatomic(void *dst, const void __user *src, unsigned size) |
198 | { | ||
199 | return copy_user_generic(dst, (__force const void *)src, size); | ||
200 | } | ||
198 | 201 | ||
199 | static __must_check __always_inline int | 202 | static __must_check __always_inline int |
200 | __copy_to_user_inatomic(void __user *dst, const void *src, unsigned size) | 203 | __copy_to_user_inatomic(void __user *dst, const void *src, unsigned size) |