aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/kernel/smp.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index e376c4c8582f..0c4637b30c04 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -334,6 +334,9 @@ void __init smp_cpus_done(unsigned int max_cpus)
apply_alternatives_all();
}
+early_param_on_off("nmi", "nonmi", enable_nmi,
+ CONFIG_USE_ICC_SYSREGS_FOR_IRQFLAGS);
+
void __init smp_prepare_boot_cpu(void)
{
cpuinfo_store_boot_cpu();
@@ -344,7 +347,8 @@ void __init smp_prepare_boot_cpu(void)
* alternatives that cannot wait until interrupt handling
* and/or scheduling is enabled.
*/
- apply_alternatives_early();
+ if (enable_nmi)
+ apply_alternatives_early();
/*
* Conditionally switch to GIC PMR for interrupt masking (this