aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2008-01-02 13:35:50 -0500
committerOlof Johansson <olof@lixom.net>2008-01-02 13:40:29 -0500
commitf0d4577c4d19f439b8f05e2c540519343e6f71e1 (patch)
tree2f4e6eb19361d0a711c7848f94f25f28a8903794
parent4f43143f9fbbb679c38d2ff99e44d3aaa00d0fe1 (diff)
[POWERPC] pasemi: Fix NMI handling check
The logic that checks to see if a machine check is caused by an NMI will always match when NMI hasn't been initialized, since the mpic routine will return NO_IRQ (and that's what the nmi_virq value is as well). Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/powerpc/platforms/pasemi/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c
index 1940e678878e..a89d098e41bf 100644
--- a/arch/powerpc/platforms/pasemi/setup.c
+++ b/arch/powerpc/platforms/pasemi/setup.c
@@ -264,7 +264,7 @@ static int pas_machine_check_handler(struct pt_regs *regs)
264 srr0 = regs->nip; 264 srr0 = regs->nip;
265 srr1 = regs->msr; 265 srr1 = regs->msr;
266 266
267 if (mpic_get_mcirq() == nmi_virq) { 267 if (nmi_virq != NO_IRQ && mpic_get_mcirq() == nmi_virq) {
268 printk(KERN_ERR "NMI delivered\n"); 268 printk(KERN_ERR "NMI delivered\n");
269 debugger(regs); 269 debugger(regs);
270 mpic_end_irq(nmi_virq); 270 mpic_end_irq(nmi_virq);