Commit 137650aa authored by Mark Rutland's avatar Mark Rutland Committed by Will Deacon
Browse files

arm64: apply alternatives for !SMP kernels

Currently we only perform alternative patching for kernels built with
CONFIG_SMP, as we call apply_alternatives_all() in smp.c, which is only
built for CONFIG_SMP. Thus !SMP kernels may not have necessary
alternatives patched in.

This patch ensures that we call apply_alternatives_all() once all CPUs
are booted, even for !SMP kernels, by having the smp_init_cpus() stub
call this for !SMP kernels via up_late_init. A new wrapper,
do_post_cpus_up_work, is added so we can hook other calls here later
(e.g. boot mode logging).

Cc: Andre Przywara <>
Cc: Catalin Marinas <>
Fixes: e039ee4e

 ("arm64: add alternative runtime patching")
Tested-by: default avatarArd Biesheuvel <>
Reviewed-by: default avatarArd Biesheuvel <>
Signed-off-by: default avatarMark Rutland <>
Signed-off-by: default avatarWill Deacon <>
parent 1baa82f4
......@@ -470,6 +470,10 @@ config HOTPLUG_CPU
source kernel/Kconfig.preempt
def_bool y
depends on !SMP
config HZ
default 100
......@@ -40,4 +40,6 @@ static inline u32 mpidr_hash_size(void)
extern u64 __cpu_logical_map[NR_CPUS];
#define cpu_logical_map(cpu) __cpu_logical_map[cpu]
void __init do_post_cpus_up_work(void);
#endif /* __ASM_SMP_PLAT_H */
......@@ -207,6 +207,18 @@ static void __init smp_build_mpidr_hash(void)
void __init do_post_cpus_up_work(void)
void __init up_late_init(void)
#endif /* CONFIG_UP_LATE_INIT */
static void __init setup_processor(void)
struct cpu_info *cpu_info;
......@@ -309,7 +309,7 @@ void cpu_die(void)
void __init smp_cpus_done(unsigned int max_cpus)
pr_info("SMP: Total of %d processors activated.\n", num_online_cpus());
void __init smp_prepare_boot_cpu(void)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment