From: Russell King <rmk+kernel@armlinux.org.uk>
Date: Mon, 13 Aug 2018 15:28:50 +0000 (+0100)
Subject: Merge branches 'fixes', 'misc' and 'spectre' into for-linus
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c61b466d4f886613c7e71de8282701646a4d999d;p=linux.git

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

Conflicts:
	arch/arm/include/asm/uaccess.h

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
---

c61b466d4f886613c7e71de8282701646a4d999d
diff --cc arch/arm/include/asm/uaccess.h
index 3d614e90c19f3,3d614e90c19f3,4140be4310873..5451e1f05a193
--- a/arch/arm/include/asm/uaccess.h
+++ b/arch/arm/include/asm/uaccess.h
@@@@ -152,8 -152,8 -159,8 +159,8 @@@@ 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 typeof(x) __r2 asm("r2");			\
++ 		register __inttype(x) __r2 asm("r2");			\
   		register unsigned long __l asm("r1") = __limit;		\
   		register int __e asm("r0");				\
   		unsigned int __ua_flags = uaccess_save_and_enable();	\
diff --cc arch/arm/kernel/head-nommu.S
index 7a9b86978ee1e,724734039492c,2e38f85b757af..ec29de2500764
--- a/arch/arm/kernel/head-nommu.S
+++ b/arch/arm/kernel/head-nommu.S
@@@@ -177,15 -185,15 -154,7 +185,15 @@@@ M_CLASS(streq	r3, [r12, #PMSAv8_MAIR1]
   	bic	r0, r0, #CR_I
   #endif
   	mcr	p15, 0, r0, c1, c0, 0		@ write control reg
 - 	isb
 ++	instr_sync
   #elif defined (CONFIG_CPU_V7M)
  +#ifdef CONFIG_ARM_MPU
  +	ldreq	r3, [r12, MPU_CTRL]
  +	biceq	r3, #MPU_CTRL_PRIVDEFENA
  +	orreq	r3, #MPU_CTRL_ENABLE
  +	streq	r3, [r12, MPU_CTRL]
  +	isb
  +#endif
   	/* For V7M systems we want to modify the CCR similarly to the SCTLR */
   #ifdef CONFIG_CPU_DCACHE_DISABLE
   	bic	r0, r0, #V7M_SCB_CCR_DC