aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-08-26 23:05:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-26 23:05:19 -0700
commit65fc7d54efb6b03dcf61d98aa0fd68fe968c211c (patch)
tree9edf5dbcb26edd5fd73accd1a032046ef1e82435
parenta3d34698086aec78ca9169b338468e3ce9bd4b3c (diff)
parentfd363bd417ddb6103564c69cfcbd92d9a7877431 (diff)
downloadlinux-yocto-4.8-65fc7d54efb6b03dcf61d98aa0fd68fe968c211c.tar.gz
linux-yocto-4.8-65fc7d54efb6b03dcf61d98aa0fd68fe968c211c.tar.bz2
linux-yocto-4.8-65fc7d54efb6b03dcf61d98aa0fd68fe968c211c.zip
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull ARM64 fix from Catalin Marinas: "ARM64 fix to avoid potential TLB conflict when CONFIG_RANDOMIZE_BASE is enabled" * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: avoid TLB conflict with CONFIG_RANDOMIZE_BASE
-rw-r--r--arch/arm64/kernel/head.S3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index b77f58355da1..3e7b050e99dc 100644
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -757,6 +757,9 @@ ENTRY(__enable_mmu)
isb
bl __create_page_tables // recreate kernel mapping
+ tlbi vmalle1 // Remove any stale TLB entries
+ dsb nsh
+
msr sctlr_el1, x19 // re-enable the MMU
isb
ic iallu // flush instructions fetched