Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

65fc7d54 · Linus Torvalds <[email protected]> · 2016-08-26 23:05:19 -07:00

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

Commit: 65fc7d54efb6b03dcf61d98aa0fd68fe968c211c
Parents: a3d34698 · fd363bd4

Merge commit. Changes below are compared with the first parent: a3d34698.

Changes

1 files changed · +3 −0

File	Status	Add	Del	Content
arch/arm64/kernel/head.S	modified	+3	−0	View file

arch/arm64/kernel/head.S

View file

diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index b77f583..3e7b050 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