projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'fixes', 'misc' and 'spectre' into for-linus
[linux-block.git]
/
arch
/
arm
/
kernel
/
head-nommu.S
diff --git
a/arch/arm/kernel/head-nommu.S
b/arch/arm/kernel/head-nommu.S
index 724734039492c753f61cf9430065ae18fd5b2b18..ec29de2500764e11ad839bda165c135f12b6a6e5 100644
(file)
--- a/
arch/arm/kernel/head-nommu.S
+++ b/
arch/arm/kernel/head-nommu.S
@@
-185,7
+185,7
@@
M_CLASS(streq r3, [r12, #PMSAv8_MAIR1])
bic r0, r0, #CR_I
#endif
mcr p15, 0, r0, c1, c0, 0 @ write control reg
- i
sb
+ i
nstr_sync
#elif defined (CONFIG_CPU_V7M)
#ifdef CONFIG_ARM_MPU
ldreq r3, [r12, MPU_CTRL]