riscv: move boot alternatives to after fill_hwcap
From: Heiko Stuebner <heiko@...> Date: Wed, 12 Jan 2022 21:15:04 +0100
Commit-Message
Move the application of boot alternatives to after the hw-capabilities are populated. This allows to check for available extensions when determining which alternatives to apply and also makes it actually work if CONFIG_SMP is disabled for whatever reason. Signed-off-by: Heiko Stuebner <heiko@...> Reviewed-by: Christoph Hellwig <hch@...> Reviewed-by: Philipp Tomsich <philipp.tomsich@...> Reviewed-by: Guo Ren <guoren@...>
Patch-Comment
arch/riscv/kernel/setup.c | 2 ++ arch/riscv/kernel/smpboot.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)
Statistics
- 2 lines added
- 2 lines removed
Changes
-------------------------- arch/riscv/kernel/setup.c ---------------------------
index f4f4a64bc3a0..9162e9a824d2 100644
@@ -21,6 +21,7 @@
#include <linux/efi.h>
#include <linux/crash_dump.h>
+#include <asm/alternative.h>
#include <asm/cpu_ops.h>
#include <asm/early_ioremap.h>
#include <asm/pgtable.h>
@@ -295,6 +296,7 @@ void __init setup_arch(char **cmdline_p)
#endif
riscv_fill_hwcap();
+ apply_boot_alternatives();
}
static int __init topology_init(void)
------------------------- arch/riscv/kernel/smpboot.c --------------------------
index a6d13dca1403..f1e4948a4b52 100644
@@ -32,7 +32,6 @@
#include <asm/sections.h>
#include <asm/sbi.h>
#include <asm/smp.h>
#include "head.h"
@@ -41,7 +40,6 @@ static DECLARE_COMPLETION(cpu_running);
void __init smp_prepare_boot_cpu(void)
{
init_cpu_topology();
}
void __init smp_prepare_cpus(unsigned int max_cpus)