Merge "Revert "arm64: kpti: force off kpti"" (b8e66109) · Commits · e / devices / android_kernel_fairphone_FP5

arch/arm64/kernel/cpufeature.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -964,8 +964,7 @@ has_useable_cnp(const struct arm64_cpu_capabilities *entry, int scope)
		}

		static bool __meltdown_safe = true;
		/* 0: not forced, >0: forced on, <0: forced off */
		static int __kpti_forced = -1;
		static int __kpti_forced; /* 0: not forced, >0: forced on, <0: forced off */

		static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry,
		int scope)