summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2020-07-13 05:56:34 +0300
committerAl Viro <viro@zeniv.linux.org.uk>2020-08-20 22:45:16 +0300
commit1d60be3c25edf4b9554fdb02aa6fb6fd75695aa7 (patch)
tree4a7c40fc3b387fa5b4c7ae95ba223cf432f55016 /arch/arm/include/asm
parentb712139543af98a91300c4e923b85d311cc77c44 (diff)
downloadlinux-1d60be3c25edf4b9554fdb02aa6fb6fd75695aa7.tar.xz
arm: propagate the calling convention changes down to csum_partial_copy_from_user()
... and get rid of the "clean the destination on error" crap. Simplifies the fault handlers and the function itself... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r--arch/arm/include/asm/checksum.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
index 1601c132b064..f0f54aef3724 100644
--- a/arch/arm/include/asm/checksum.h
+++ b/arch/arm/include/asm/checksum.h
@@ -38,20 +38,17 @@ __wsum
csum_partial_copy_nocheck(const void *src, void *dst, int len);
__wsum
-csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
+csum_partial_copy_from_user(const void __user *src, void *dst, int len);
#define _HAVE_ARCH_COPY_AND_CSUM_FROM_USER
#define _HAVE_ARCH_CSUM_AND_COPY
static inline
__wsum csum_and_copy_from_user(const void __user *src, void *dst, int len)
{
- int err = 0;
-
if (!access_ok(src, len))
return 0;
- sum = csum_partial_copy_from_user(src, dst, len, ~0U, &err);
- return err ? 0 : sum;
+ return csum_partial_copy_from_user(src, dst, len);
}
/*