From 428413e2e6d904df42cc071e73e2b2990d4c1b6f Mon Sep 17 00:00:00 2001 From: Vinayak Menon Date: Thu, 10 Sep 2020 12:14:03 +0530 Subject: [PATCH] Revert "arm64: kpti: force off kpti" Control kpti via bootargs and keep default as enabled. This reverts commit 1edf9722d4071253c1591a54bfef91e71a7ed976. Change-Id: I707641061ad67498228df64e361139baf2b7a1a3 Signed-off-by: Vinayak Menon --- arch/arm64/kernel/cpufeature.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index d0fa46d335e3..a44bcffa2ec2 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -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)