2 files changed, 6 insertions, 21 deletions

diff --git a/arch/x86/include/asm/pmem.h b/arch/x86/include/asm/pmem.h
index f4c119d253f3..4759a179aa52 100644
--- a/arch/x86/include/asm/pmem.h
+++ b/arch/x86/include/asm/pmem.h
@@ -44,27 +44,6 @@ static inline void arch_memcpy_to_pmem(void *dst, const void *src, size_t n)
                 BUG();
 }
 
-/**
- * arch_wb_cache_pmem - write back a cache range with CLWB
- * @vaddr:      virtual start address
- * @size:       number of bytes to write back
- *
- * Write back a cache range using the CLWB (cache line write back)
- * instruction. Note that @size is internally rounded up to be cache
- * line size aligned.
- */
-static inline void arch_wb_cache_pmem(void *addr, size_t size)
-{
-        u16 x86_clflush_size = boot_cpu_data.x86_clflush_size;
-        unsigned long clflush_mask = x86_clflush_size - 1;
-        void *vend = addr + size;
-        void *p;
-
-        for (p = (void *)((unsigned long)addr & ~clflush_mask);
-             p < vend; p += x86_clflush_size)
-                clwb(p);
-}
-
 static inline void arch_invalidate_pmem(void *addr, size_t size)
 {
         clflush_cache_range(addr, size);
diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
index f42d2fd86ca3..75d3776123cc 100644
--- a/arch/x86/lib/usercopy_64.c
+++ b/arch/x86/lib/usercopy_64.c
@@ -97,6 +97,12 @@ static void clean_cache_range(void *addr, size_t size)
                 clwb(p);
 }
 
+void arch_wb_cache_pmem(void *addr, size_t size)
+{
+        clean_cache_range(addr, size);
+}
+EXPORT_SYMBOL_GPL(arch_wb_cache_pmem);
+
 long __copy_user_flushcache(void *dst, const void __user *src, unsigned size)
 {
         unsigned long flushed, dest = (unsigned long) dst;