diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2020-02-18 14:26:32 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2020-05-29 16:11:50 -0400 |
commit | 5904122c46581a5ccee54a51ef07e0d891fd7aef (patch) | |
tree | 433bbafc1e3a3cdbfd291d51cfd858186683dff2 /arch/s390/include | |
parent | 24f9aa928c3cc88bae573b39b6976844968f80a0 (diff) | |
download | linux-stable-5904122c46581a5ccee54a51ef07e0d891fd7aef.tar.gz linux-stable-5904122c46581a5ccee54a51ef07e0d891fd7aef.tar.bz2 linux-stable-5904122c46581a5ccee54a51ef07e0d891fd7aef.zip |
take the dummy csum_and_copy_from_user() into net/checksum.h
now that can be done conveniently - all non-trivial cases have
_HAVE_ARCH_COPY_AND_CSUM_FROM_USER defined, so the fallback in
net/checksum.h is used only for dummy (copy_from_user, then
csum_partial) implementation. Allowing us to get rid of all
dummy instances, both of csum_and_copy_from_user() and
csum_partial_copy_from_user().
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/s390/include')
-rw-r--r-- | arch/s390/include/asm/checksum.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/s390/include/asm/checksum.h b/arch/s390/include/asm/checksum.h index 91e376b0d28c..6d01c96aeb5c 100644 --- a/arch/s390/include/asm/checksum.h +++ b/arch/s390/include/asm/checksum.h @@ -39,25 +39,6 @@ csum_partial(const void *buff, int len, __wsum sum) return sum; } -/* - * the same as csum_partial_copy, but copies from user space. - * - * here even more important to align src and dst on a 32-bit (or even - * better 64-bit) boundary - * - * Copy from userspace and compute checksum. - */ -static inline __wsum -csum_partial_copy_from_user(const void __user *src, void *dst, - int len, __wsum sum, - int *err_ptr) -{ - if (unlikely(copy_from_user(dst, src, len))) - *err_ptr = -EFAULT; - return csum_partial(dst, len, sum); -} - - static inline __wsum csum_partial_copy_nocheck (const void *src, void *dst, int len, __wsum sum) { |