uio, lib: Fix CONFIG_ARCH_HAS_UACCESS_MCSAFE compilation

Add a common Kconfig CONFIG_ARCH_HAS_UACCESS_MCSAFE that archs can
optionally select, and fixup the declaration of _copy_to_iter_mcsafe().

Fixes: 8780356ef630 ("x86/asm/memcpy_mcsafe: Define copy_to_iter_mcsafe()")
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/include/linux/uio.h b/include/linux/uio.h
index f5766e853a771c3e42ea056167507e59147a1366..409c845d4cd3dce5762c27a2e7e7c1c5c288f134 100644 (file)
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -155,7 +155,7 @@ size_t _copy_from_iter_flushcache(void *addr, size_t bytes, struct iov_iter *i);
 #endif
 
 #ifdef CONFIG_ARCH_HAS_UACCESS_MCSAFE
-size_t _copy_to_iter_mcsafe(void *addr, size_t bytes, struct iov_iter *i);
+size_t _copy_to_iter_mcsafe(const void *addr, size_t bytes, struct iov_iter *i);
 #else
 #define _copy_to_iter_mcsafe _copy_to_iter
 #endif

diff --git a/lib/Kconfig b/lib/Kconfig
index 5fe577673b985d91c68d8a907cebc4641290e9af..907f6e4f1cf27d8fc67424f7046a4b3c4a07cfe6 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -586,6 +586,9 @@ config ARCH_HAS_PMEM_API
 config ARCH_HAS_UACCESS_FLUSHCACHE
        bool
 
+config ARCH_HAS_UACCESS_MCSAFE
+       bool
+
 config STACKDEPOT
        bool
        select STACKTRACE