diff options
| -rw-r--r-- | arch/arm/include/asm/proc-fns.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/uaccess.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/proc-fns.h b/arch/arm/include/asm/proc-fns.h index 9b3105a2a5e0..b4986a23d852 100644 --- a/arch/arm/include/asm/proc-fns.h +++ b/arch/arm/include/asm/proc-fns.h @@ -187,7 +187,7 @@ static inline unsigned int cpu_get_ttbcr(void) static inline void cpu_set_ttbcr(unsigned int ttbcr) { - asm("mcr p15, 0, %0, c2, c0, 2" : : "r" (ttbcr)); + asm volatile("mcr p15, 0, %0, c2, c0, 2" : : "r" (ttbcr) : "memory"); } #else /*!CONFIG_MMU */ diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h index 25d21d7d6e3e..6c9c16d767cf 100644 --- a/arch/arm/include/asm/uaccess.h +++ b/arch/arm/include/asm/uaccess.h @@ -47,7 +47,7 @@ static __always_inline void uaccess_restore(unsigned int flags) #elif defined(CONFIG_CPU_TTBR0_PAN) -static inline unsigned int uaccess_save_and_enable(void) +static __always_inline unsigned int uaccess_save_and_enable(void) { unsigned int old_ttbcr = cpu_get_ttbcr(); |