diff mbox series

[tip:,x86/cleanups] x86/uaccess: Remove memcpy_page_flushcache()

Message ID 167898093734.5837.6665906842521706513.tip-bot2@tip-bot2
State New
Headers
Series [tip:,x86/cleanups] x86/uaccess: Remove memcpy_page_flushcache() |

Commit Message

tip-bot2 for Thomas Gleixner March 16, 2023, 3:35 p.m. UTC 
  The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID:     b9da86e3aade0cd8c8b60a0f6356e7730fc90d5d
Gitweb:        https://git.kernel.org/tip/b9da86e3aade0cd8c8b60a0f6356e7730fc90d5d
Author:        Ira Weiny <ira.weiny@intel.com>
AuthorDate:    Wed, 15 Mar 2023 16:20:54 -07:00
Committer:     Dave Hansen <dave.hansen@linux.intel.com>
CommitterDate: Thu, 16 Mar 2023 08:27:57 -07:00

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
---
 arch/x86/include/asm/uaccess_64.h |  2 --
 arch/x86/lib/usercopy_64.c        |  9 ---------
 2 files changed, 11 deletions(-)
diff mbox series

Patch

diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
index d13d71a..c6b1dcd 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 6c1f8ac..f515542 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