uio, lib: Fix CONFIG_ARCH_HAS_UACCESS_MCSAFE compilation
authorDan Williams <dan.j.williams@intel.com>
Wed, 23 May 2018 06:17:03 +0000 (23:17 -0700)
committerDan Williams <dan.j.williams@intel.com>
Wed, 23 May 2018 06:17:03 +0000 (23:17 -0700)
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>
include/linux/uio.h
lib/Kconfig

index f5766e8..409c845 100644 (file)
@@ -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
index 5fe5776..907f6e4 100644 (file)
@@ -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