diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-03-19 15:28:30 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-03-28 18:23:31 -0400 |
| commit | b71f1bf57f995ae4ce0fe2f907604c841ca8493f (patch) | |
| tree | c38e9a3c1d58d88cde3a7a0480f8b52abae26235 /arch/cris/include | |
| parent | de09be340d3ef4568b27282f2f6fc44b1cb559ab (diff) | |
| download | talos-obmc-linux-b71f1bf57f995ae4ce0fe2f907604c841ca8493f.tar.gz talos-obmc-linux-b71f1bf57f995ae4ce0fe2f907604c841ca8493f.zip | |
cris: rename __copy_user_zeroing to __copy_user_in
... now that it doesn't zero anymore
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/cris/include')
| -rw-r--r-- | arch/cris/include/asm/uaccess.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/cris/include/asm/uaccess.h b/arch/cris/include/asm/uaccess.h index c8858e15d709..fc30fdae8786 100644 --- a/arch/cris/include/asm/uaccess.h +++ b/arch/cris/include/asm/uaccess.h @@ -169,7 +169,7 @@ extern long __get_user_bad(void); live in lib/usercopy.c */ extern unsigned long __copy_user(void __user *to, const void *from, unsigned long n); -extern unsigned long __copy_user_zeroing(void *to, const void __user *from, unsigned long n); +extern unsigned long __copy_user_in(void *to, const void __user *from, unsigned long n); extern unsigned long __do_clear_user(void __user *to, unsigned long n); static inline long @@ -236,7 +236,7 @@ __constant_copy_from_user(void *to, const void __user *from, unsigned long n) else if (n == 24) __asm_copy_from_user_24(to, from, ret); else - ret = __copy_user_zeroing(to, from, n); + ret = __copy_user_in(to, from, n); return ret; } @@ -343,7 +343,7 @@ static inline size_t copy_from_user(void *to, const void __user *from, size_t n) if (__builtin_constant_p(n)) res = __constant_copy_from_user(to, from, n); else - res = __copy_user_zeroing(to, from, n); + res = __copy_user_in(to, from, n); } if (unlikely(res)) memset(to + n - res , 0, res); @@ -368,7 +368,7 @@ static inline unsigned long __generic_copy_from_user_nocheck(void *to, const void __user *from, unsigned long n) { - return __copy_user_zeroing(to, from, n); + return __copy_user_in(to, from, n); } static inline unsigned long |
