TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/reboot: Update nonmi_ipi parameter

Browse Source 
Update the nonmi_ipi parameter to reflect the simple change
instead of the previous complicated one.  There should be less
of a need to use it but there may still be corner cases on older
hardware that stumble into NMI issues.

Signed-off-by: Don Zickus <dzickus@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1336761675-24296-4-git-send-email-dzickus@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Don Zickus
2012-05-11 14:41:15 -04:00
committed by Ingo Molnar
parent 7d007d21e5
commit 3aac27aba7
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/x86/kernel/smp.c
+4 -8
View File
@@ -110,6 +110,7 @@
*/ */
static atomic_t stopping_cpu = ATOMIC_INIT(-1); static atomic_t stopping_cpu = ATOMIC_INIT(-1);
static bool smp_no_nmi_ipi = false;
/* /*
* this function sends a 'reschedule' IPI to another CPU. * this function sends a 'reschedule' IPI to another CPU.
@@ -216,7 +217,7 @@ static void native_stop_other_cpus(int wait)
} }
/* if the REBOOT_VECTOR didn't work, try with the NMI */ /* if the REBOOT_VECTOR didn't work, try with the NMI */
if ((num_online_cpus() > 1)) { if ((num_online_cpus() > 1) && (!smp_no_nmi_ipi)) {
if (register_nmi_handler(NMI_LOCAL, smp_stop_nmi_callback, if (register_nmi_handler(NMI_LOCAL, smp_stop_nmi_callback,
NMI_FLAG_FIRST, "smp_stop")) NMI_FLAG_FIRST, "smp_stop"))
/* Note: we ignore failures here */ /* Note: we ignore failures here */
@@ -245,11 +246,6 @@ finish:
local_irq_restore(flags); local_irq_restore(flags);
} }
static void native_smp_disable_nmi_ipi(void)
{
smp_ops.stop_other_cpus = native_irq_stop_other_cpus;
}
/* /*
* Reschedule call back. * Reschedule call back.
*/ */
@@ -283,8 +279,8 @@ void smp_call_function_single_interrupt(struct pt_regs *regs)
static int __init nonmi_ipi_setup(char *str) static int __init nonmi_ipi_setup(char *str)
{ {
native_smp_disable_nmi_ipi(); smp_no_nmi_ipi = true;
return 1; return 1;
} }
__setup("nonmi_ipi", nonmi_ipi_setup); __setup("nonmi_ipi", nonmi_ipi_setup);