Commit 35f84584 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:
 "Fix a regression where the arm64 KPTI ends up enabled even on systems
  that don't need it"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: Avoid enabling KPTI unnecessarily
parents 1a2b4185 f5259997

arch/arm64/kernel/cpufeature.c

+4 −0
Original line number Diff line number Diff line
@@ -1839,6 +1839,10 @@ static int __init __kpti_install_ng_mappings(void *__unused) 


static void __init kpti_install_ng_mappings(void)

{

	/* Check whether KPTI is going to be used */

	if (!cpus_have_cap(ARM64_UNMAP_KERNEL_AT_EL0))

		return;



	/*

	 * We don't need to rewrite the page-tables if either we've done

	 * it already or we have KASLR enabled and therefore have not