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

Commit 321183c1 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: add reboot_force test to native_smp_send_stop 



This can be safely added to i386. After that,
functions look exactly the same for both arches

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3be5b49e

arch/x86/kernel/smp_32.c

+7 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <asm/tlbflush.h>

#include <asm/mmu_context.h>

#include <mach_apic.h>

#include <asm/proto.h>



/*

 *	Some notes on x86 processor bugs affecting SMP operation:
@@ -622,10 +623,14 @@ static void stop_this_cpu (void * dummy) 


static void native_smp_send_stop(void)

{

	/* Don't deadlock on the call lock in panic */

	int nolock = !spin_trylock(&call_lock);

	int nolock;

	unsigned long flags;



	if (reboot_force)

		return;



	/* Don't deadlock on the call lock in panic */

	nolock = !spin_trylock(&call_lock);

	local_irq_save(flags);

	__smp_call_function(stop_this_cpu, NULL, 0, 0);

	if (!nolock)