Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65fc7d54 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a3d34698 fd363bd4

arch/arm64/kernel/head.S

+3 −0
Original line number Diff line number Diff line
@@ -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