aboutsummaryrefslogtreecommitdiff
path: root/arch/arm64/kernel/smp.c
diff options
context:
space:
mode:
authorDaniel Thompson <daniel.thompson@linaro.org>2015-11-20 19:51:13 +0000
committerDaniel Thompson <daniel.thompson@linaro.org>2016-03-15 14:22:11 +0000
commit563ff0286948e66af5c2eae069ec49527a371b41 (patch)
tree97b76cd3e121d6e977f76adad099efa3eba9e424 /arch/arm64/kernel/smp.c
parent67db8f587efaa1e93e2ff7105bbd66c1410b4641 (diff)
downloadlinux-563ff0286948e66af5c2eae069ec49527a371b41.tar.gz
arm64: Add runtime NMI disable mode
For benchmarking... Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>
Diffstat (limited to 'arch/arm64/kernel/smp.c')
-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