Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3aac27ab authored by Don Zickus's avatar Don Zickus Committed by Ingo Molnar
Browse files

x86/reboot: Update nonmi_ipi parameter 



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: default avatarDon 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: default avatarIngo Molnar <mingo@kernel.org>
parent 7d007d21

arch/x86/kernel/smp.c

+4 −8
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ 
 */



static atomic_t stopping_cpu = ATOMIC_INIT(-1);

static bool smp_no_nmi_ipi = false;



/*

 * 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 ((num_online_cpus() > 1))  {

	if ((num_online_cpus() > 1) && (!smp_no_nmi_ipi))  {

		if (register_nmi_handler(NMI_LOCAL, smp_stop_nmi_callback,

					 NMI_FLAG_FIRST, "smp_stop"))

			/* Note: we ignore failures here */
@@ -245,11 +246,6 @@ finish: 
	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.

 */
@@ -283,7 +279,7 @@ void smp_call_function_single_interrupt(struct pt_regs *regs) 


static int __init nonmi_ipi_setup(char *str)

{

        native_smp_disable_nmi_ipi();

	smp_no_nmi_ipi = true;

	return 1;

}