Re: [PATCH v4 18/21] arm64: Move "nokaslr" over to the early cpufeature infrastructure
From: Catalin Marinas <catalin.marinas@arm.com>
Date: 2021-01-23 14:20:58
Also in:
kvmarm, lkml
On Mon, Jan 18, 2021 at 09:45:30AM +0000, Marc Zyngier wrote:
quoted hunk ↗ jump to hunk
Given that the early cpufeature infrastructure has borrowed quite a lot of code from the kaslr implementation, let's reimplement the matching of the "nokaslr" option with it. Signed-off-by: Marc Zyngier <maz@kernel.org> --- arch/arm64/kernel/idreg-override.c | 17 ++++++++++++++ arch/arm64/kernel/kaslr.c | 37 +++--------------------------- 2 files changed, 20 insertions(+), 34 deletions(-)diff --git a/arch/arm64/kernel/idreg-override.c b/arch/arm64/kernel/idreg-override.c index 1db54878b2c4..143fe7b8e3ce 100644 --- a/arch/arm64/kernel/idreg-override.c +++ b/arch/arm64/kernel/idreg-override.c@@ -33,8 +33,24 @@ static const struct reg_desc mmfr1 __initdata = { }, }; +extern u64 kaslr_feature_val; +extern u64 kaslr_feature_mask; + +static const struct reg_desc kaslr __initdata = { + .name = "kaslr",
We might as well rename this ftr_override or something more generic as we no longer describe registers here. Otherwise: Acked-by: Catalin Marinas <catalin.marinas@arm.com> _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel