Merge tag 'mm-stable-2023-04-27-15-30' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / arch / arm64 / include / asm / uaccess.h

diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
index 30ea7b5c3ccb03dbcfd5ed1f51c9c3ecc5fa1057..05f4fc265428457b8316859f7bab81622aacc994 100644 (file)
--- a/arch/arm64/include/asm/uaccess.h
+++ b/arch/arm64/include/asm/uaccess.h
@@ -191,7 +191,7 @@ static inline void __user *__uaccess_mask_ptr(const void __user *ptr)
        "1:     " load "        " reg "1, [%2]\n"                       \
        "2:\n"                                                          \
        _ASM_EXTABLE_##type##ACCESS_ERR_ZERO(1b, 2b, %w0, %w1)          \
-       : "+r" (err), "=&r" (x)                                         \
+       : "+r" (err), "=r" (x)                                          \
        : "r" (addr))
 
 #define __raw_get_mem(ldr, x, ptr, err, type)                                  \
@@ -281,7 +281,7 @@ do {                                                                        \
        "2:\n"                                                          \
        _ASM_EXTABLE_##type##ACCESS_ERR(1b, 2b, %w0)                    \
        : "+r" (err)                                                    \
-       : "r" (x), "r" (addr))
+       : "rZ" (x), "r" (addr))
 
 #define __raw_put_mem(str, x, ptr, err, type)                                  \
 do {                                                                           \
@@ -403,8 +403,6 @@ extern long strncpy_from_user(char *dest, const char __user *src, long count);
 extern __must_check long strnlen_user(const char __user *str, long n);
 
 #ifdef CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE
-struct page;
-void memcpy_page_flushcache(char *to, struct page *page, size_t offset, size_t len);
 extern unsigned long __must_check __copy_user_flushcache(void *to, const void __user *from, unsigned long n);
 
 static inline int __copy_from_user_flushcache(void *dst, const void __user *src, unsigned size)