Merge branches 'fixes', 'misc' and 'spectre' into for-linus

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

diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
index 4140be43108731ba89894bd20e1e6551e350f488..5451e1f05a193c002f3b30af921975a28c232833 100644 (file)
--- a/arch/arm/include/asm/uaccess.h
+++ b/arch/arm/include/asm/uaccess.h
@@ -159,7 +159,7 @@ extern int __get_user_64t_4(void *);
 #define __get_user_check(x, p)                                         \
        ({                                                              \
                unsigned long __limit = current_thread_info()->addr_limit - 1; \
-               register const typeof(*(p)) __user *__p asm("r0") = (p);\
+               register typeof(*(p)) __user *__p asm("r0") = (p);      \
                register __inttype(x) __r2 asm("r2");                   \
                register unsigned long __l asm("r1") = __limit;         \
                register int __e asm("r0");                             \