Skip to content

Commit

Permalink
x86: add reboot_force test to native_smp_send_stop
Browse files Browse the repository at this point in the history
This can be safely added to i386. After that,
functions look exactly the same for both arches

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Glauber Costa authored and Ingo Molnar committed Apr 17, 2008
1 parent 3be5b49 commit 321183c
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions arch/x86/kernel/smp_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 321183c

Please sign in to comment.