aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-03-03 14:12:50 -0300
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:40:55 +0200
commit321183c145a37e6d31cc55e0f69a226f9006e621 (patch)
treef230034dc40d34c5592185994d48ae9907ad87c8 /arch
parent3be5b49e8f1002bc562a2b4670093e4ebf27b4e9 (diff)
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: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/smp_32.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/x86/kernel/smp_32.c b/arch/x86/kernel/smp_32.c
index cde3a0ecd71..8be3e091dcd 100644
--- a/arch/x86/kernel/smp_32.c
+++ b/arch/x86/kernel/smp_32.c
@@ -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)