diff options
| -rw-r--r-- | arch/x86/include/asm/uaccess_64.h | 6 | ||||
| -rw-r--r-- | arch/x86/lib/copy_user_64.S | 4 | ||||
| -rw-r--r-- | arch/x86/lib/usercopy_64.c | 2 | ||||
| -rw-r--r-- | drivers/infiniband/sw/rdmavt/qp.c | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h index 435ca24c5e1d..0a49a8de9f3c 100644 --- a/arch/x86/include/asm/uaccess_64.h +++ b/arch/x86/include/asm/uaccess_64.h @@ -52,9 +52,7 @@ raw_copy_to_user(void __user *dst, const void *src, unsigned long size) return copy_user_generic((__force void *)dst, src, size); } -extern long __copy_user_nocache(void *dst, const void __user *src, - unsigned size, int zerorest); - +extern long __copy_user_nocache(void *dst, const void __user *src, unsigned size); extern long __copy_user_flushcache(void *dst, const void __user *src, unsigned size); extern void memcpy_page_flushcache(char *to, struct page *page, size_t offset, size_t len); @@ -66,7 +64,7 @@ __copy_from_user_inatomic_nocache(void *dst, const void __user *src, long ret; kasan_check_write(dst, size); stac(); - ret = __copy_user_nocache(dst, src, size, 0); + ret = __copy_user_nocache(dst, src, size); clac(); return ret; } diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S index 85e6c45b1ca9..d424fb75e0f0 100644 --- a/arch/x86/lib/copy_user_64.S +++ b/arch/x86/lib/copy_user_64.S @@ -290,7 +290,7 @@ SYM_FUNC_START(__copy_user_nocache) _ASM_EXTABLE_CPY(41b, .L_fixup_1b_copy) /* - * Try to copy last bytes and clear the rest if needed. + * Try to copy last bytes. * Since protection fault in copy_from/to_user is not a normal situation, * it is not necessary to optimize tail handling. * Don't try to copy the tail if machine check happened @@ -320,7 +320,7 @@ SYM_FUNC_START(__copy_user_nocache) _ASM_EXTABLE_CPY(1b, 2b) .Lcopy_user_handle_align: - addl %ecx,%edx /* ecx is zerorest also */ + addl %ecx,%edx jmp .Lcopy_user_handle_tail SYM_FUNC_END(__copy_user_nocache) diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c index 15704c605a2b..c3a5bbc0b41e 100644 --- a/arch/x86/lib/usercopy_64.c +++ b/arch/x86/lib/usercopy_64.c @@ -48,7 +48,7 @@ long __copy_user_flushcache(void *dst, const void __user *src, unsigned size) long rc; stac(); - rc = __copy_user_nocache(dst, src, size, 0); + rc = __copy_user_nocache(dst, src, size); clac(); /* diff --git a/drivers/infiniband/sw/rdmavt/qp.c b/drivers/infiniband/sw/rdmavt/qp.c index 3acab569fbb9..9b4c0389d2c0 100644 --- a/drivers/infiniband/sw/rdmavt/qp.c +++ b/drivers/infiniband/sw/rdmavt/qp.c @@ -97,7 +97,7 @@ static void cacheless_memcpy(void *dst, void *src, size_t n) * there are no security issues. The extra fault recovery machinery * is not invoked. */ - __copy_user_nocache(dst, (void __user *)src, n, 0); + __copy_user_nocache(dst, (void __user *)src, n); } void rvt_wss_exit(struct rvt_dev_info *rdi) |