Messages in this thread Patch in this message |  | | From | Glauber Costa <> | | Subject | [PATCH 22/52] add reboot_force test to native_smp_send_stop | | Date | Mon, 3 Mar 2008 14:12:50 -0300 |
| |
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> --- arch/x86/kernel/smp_32.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/smp_32.c b/arch/x86/kernel/smp_32.c index cde3a0e..8be3e09 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) -- 1.5.0.6
|  |