Loading arch/cris/arch-v10/lib/usercopy.c +3 −4 Original line number Diff line number Diff line Loading @@ -188,11 +188,10 @@ unsigned long __copy_user(void __user *pdst, const void *psrc, unsigned long pn) } EXPORT_SYMBOL(__copy_user); /* Copy from user to kernel, zeroing the bytes that were inaccessible in userland. The return-value is the number of bytes that were /* Copy from user to kernel. The return-value is the number of bytes that were inaccessible. */ unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc, unsigned long __copy_user_in(void *pdst, const void __user *psrc, unsigned long pn) { /* We want the parameters put in special registers. Loading Loading @@ -357,7 +356,7 @@ unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc, exception: return retn + n; } EXPORT_SYMBOL(__copy_user_zeroing); EXPORT_SYMBOL(__copy_user_in); /* Zero userspace. */ unsigned long __do_clear_user(void __user *pto, unsigned long pn) Loading arch/cris/arch-v32/lib/usercopy.c +3 −4 Original line number Diff line number Diff line Loading @@ -156,10 +156,9 @@ unsigned long __copy_user(void __user *pdst, const void *psrc, unsigned long pn) } EXPORT_SYMBOL(__copy_user); /* Copy from user to kernel, zeroing the bytes that were inaccessible in userland. The return-value is the number of bytes that were /* Copy from user to kernel. The return-value is the number of bytes that were inaccessible. */ unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc, unsigned long __copy_user_in(void *pdst, const void __user *psrc, unsigned long pn) { /* We want the parameters put in special registers. Loading Loading @@ -309,7 +308,7 @@ unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc, exception: return retn + n; } EXPORT_SYMBOL(__copy_user_zeroing); EXPORT_SYMBOL(__copy_user_in); /* Zero userspace. */ unsigned long __do_clear_user(void __user *pto, unsigned long pn) Loading arch/cris/include/asm/uaccess.h +4 −4 Original line number Diff line number Diff line Loading @@ -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 Loading Loading @@ -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; } Loading Loading @@ -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); Loading @@ -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 Loading Loading
arch/cris/arch-v10/lib/usercopy.c +3 −4 Original line number Diff line number Diff line Loading @@ -188,11 +188,10 @@ unsigned long __copy_user(void __user *pdst, const void *psrc, unsigned long pn) } EXPORT_SYMBOL(__copy_user); /* Copy from user to kernel, zeroing the bytes that were inaccessible in userland. The return-value is the number of bytes that were /* Copy from user to kernel. The return-value is the number of bytes that were inaccessible. */ unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc, unsigned long __copy_user_in(void *pdst, const void __user *psrc, unsigned long pn) { /* We want the parameters put in special registers. Loading Loading @@ -357,7 +356,7 @@ unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc, exception: return retn + n; } EXPORT_SYMBOL(__copy_user_zeroing); EXPORT_SYMBOL(__copy_user_in); /* Zero userspace. */ unsigned long __do_clear_user(void __user *pto, unsigned long pn) Loading
arch/cris/arch-v32/lib/usercopy.c +3 −4 Original line number Diff line number Diff line Loading @@ -156,10 +156,9 @@ unsigned long __copy_user(void __user *pdst, const void *psrc, unsigned long pn) } EXPORT_SYMBOL(__copy_user); /* Copy from user to kernel, zeroing the bytes that were inaccessible in userland. The return-value is the number of bytes that were /* Copy from user to kernel. The return-value is the number of bytes that were inaccessible. */ unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc, unsigned long __copy_user_in(void *pdst, const void __user *psrc, unsigned long pn) { /* We want the parameters put in special registers. Loading Loading @@ -309,7 +308,7 @@ unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc, exception: return retn + n; } EXPORT_SYMBOL(__copy_user_zeroing); EXPORT_SYMBOL(__copy_user_in); /* Zero userspace. */ unsigned long __do_clear_user(void __user *pto, unsigned long pn) Loading
arch/cris/include/asm/uaccess.h +4 −4 Original line number Diff line number Diff line Loading @@ -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 Loading Loading @@ -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; } Loading Loading @@ -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); Loading @@ -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 Loading
Al Viro <viro@zeniv.linux.org.uk>Al Viro <viro@zeniv.linux.org.uk>