--- arch/powerpc/kernel/crash.c

+++ arch/powerpc/kernel/crash.c

@@ -347,10 +347,12 @@ int crash_shutdown_unregister(crash_shut

EXPORT_SYMBOL(crash_shutdown_unregister);

static unsigned long crash_shutdown_buf[JMP_BUF_LEN];

+static int crash_shutdown_cpu = -1;

static int handle_fault(struct pt_regs *regs)

{

- longjmp(crash_shutdown_buf, 1);

+ if (crash_shutdown_cpu == smp_processor_id())

+ longjmp(crash_shutdown_buf, 1);

return 0;

}

@@ -375,11 +377,14 @@ void default_machine_crash_shutdown(stru

for_each_irq(i) {

struct irq_desc *desc = irq_desc + i;

+ if (!desc || !desc->chip || !desc->chip->eoi)

+ continue;

+

if (desc->status & IRQ_INPROGRESS)

desc->chip->eoi(i);

if (!(desc->status & IRQ_DISABLED))

- desc->chip->disable(i);

+ desc->chip->shutdown(i);

}

/*

@@ -388,6 +393,7 @@ void default_machine_crash_shutdown(stru

*/

old_handler = __debugger_fault_handler;

__debugger_fault_handler = handle_fault;

+ crash_shutdown_cpu = smp_processor_id();

for (i = 0; crash_shutdown_handles[i]; i++) {

if (setjmp(crash_shutdown_buf) == 0) {

/*

@@ -401,6 +407,7 @@ void default_machine_crash_shutdown(stru

asm volatile("sync; isync");

}

}

+ crash_shutdown_cpu = -1;

__debugger_fault_handler = old_handler;

/*