diff options
| author | Ira Weiny <ira.weiny@intel.com> | 2023-03-15 16:20:54 -0700 |
|---|---|---|
| committer | Dave Hansen <dave.hansen@linux.intel.com> | 2023-03-16 08:27:57 -0700 |
| commit | b9da86e3aade0cd8c8b60a0f6356e7730fc90d5d (patch) | |
| tree | c70b41bc32aaa3ec38ad11535c605f50bbd090c7 | |
| parent | 8c3223a50faf1d173e0159eff10a9de902407135 (diff) | |
| download | linux-stable-b9da86e3aade0cd8c8b60a0f6356e7730fc90d5d.tar.gz linux-stable-b9da86e3aade0cd8c8b60a0f6356e7730fc90d5d.tar.bz2 linux-stable-b9da86e3aade0cd8c8b60a0f6356e7730fc90d5d.zip | |
x86/uaccess: Remove memcpy_page_flushcache()
Commit 21b56c847753 ("iov_iter: get rid of separate bvec and xarray
callbacks") removed the calls to memcpy_page_flushcache().
In addition, memcpy_page_flushcache() uses the deprecated
kmap_atomic().
Remove the unused x86 memcpy_page_flushcache() implementation and
also get rid of one more kmap_atomic() user.
[ dhansen: tweak changelog ]
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/all/20221230-kmap-x86-v1-1-15f1ecccab50%40intel.com
| -rw-r--r-- | arch/x86/include/asm/uaccess_64.h | 2 | ||||
| -rw-r--r-- | arch/x86/lib/usercopy_64.c | 9 |
2 files changed, 0 insertions, 11 deletions
diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h index d13d71af5cf6..c6b1dcded364 100644 --- a/arch/x86/include/asm/uaccess_64.h +++ b/arch/x86/include/asm/uaccess_64.h @@ -62,8 +62,6 @@ extern long __copy_user_nocache(void *dst, const void __user *src, unsigned size, int zerorest); 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); static inline int __copy_from_user_inatomic_nocache(void *dst, const void __user *src, diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c index 6c1f8ac5e721..f515542f017f 100644 --- a/arch/x86/lib/usercopy_64.c +++ b/arch/x86/lib/usercopy_64.c @@ -136,13 +136,4 @@ void __memcpy_flushcache(void *_dst, const void *_src, size_t size) } } EXPORT_SYMBOL_GPL(__memcpy_flushcache); - -void memcpy_page_flushcache(char *to, struct page *page, size_t offset, - size_t len) -{ - char *from = kmap_atomic(page); - - memcpy_flushcache(to, from + offset, len); - kunmap_atomic(from); -} #endif |