Commit ce53af94 authored by Fernando Vazquez's avatar Fernando Vazquez Committed by Linus Torvalds

[PATCH] stack overflow safe kdump: crash: use safe_smp_processor_id()

Substitute "smp_processor_id" with the stack overflow-safe
"safe_smp_processor_id" in the reboot path to the second kernel.

[akpm@osdl.org: build fix]
Signed-off-by: default avatarFernando Vazquez <fernando@intellilink.co.jp>
Looks-reasonable-to: Andi Kleen <ak@muc.de>
Acked-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2654c08c
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <asm/hw_irq.h> #include <asm/hw_irq.h>
#include <asm/apic.h> #include <asm/apic.h>
#include <asm/kdebug.h> #include <asm/kdebug.h>
#include <asm/smp.h>
#include <mach_ipi.h> #include <mach_ipi.h>
...@@ -88,7 +89,7 @@ static void crash_save_self(struct pt_regs *regs) ...@@ -88,7 +89,7 @@ static void crash_save_self(struct pt_regs *regs)
{ {
int cpu; int cpu;
cpu = smp_processor_id(); cpu = safe_smp_processor_id();
crash_save_this_cpu(regs, cpu); crash_save_this_cpu(regs, cpu);
} }
...@@ -185,7 +186,7 @@ void machine_crash_shutdown(struct pt_regs *regs) ...@@ -185,7 +186,7 @@ void machine_crash_shutdown(struct pt_regs *regs)
local_irq_disable(); local_irq_disable();
/* Make a note of crashing cpu. Will be used in NMI callback.*/ /* Make a note of crashing cpu. Will be used in NMI callback.*/
crashing_cpu = smp_processor_id(); crashing_cpu = safe_smp_processor_id();
nmi_shootdown_cpus(); nmi_shootdown_cpus();
lapic_shutdown(); lapic_shutdown();
#if defined(CONFIG_X86_IO_APIC) #if defined(CONFIG_X86_IO_APIC)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment