Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f0d4577c4d19f439b8f05e2c540519343e6f71e1 Commit: f0d4577c4d19f439b8f05e2c540519343e6f71e1 Parent: 4f43143f9fbbb679c38d2ff99e44d3aaa00d0fe1 Author: Olof Johansson <[EMAIL PROTECTED]> AuthorDate: Wed Jan 2 12:35:50 2008 -0600 Committer: Olof Johansson <[EMAIL PROTECTED]> CommitDate: Wed Jan 2 12:40:29 2008 -0600
[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 <[EMAIL PROTECTED]> --- arch/powerpc/platforms/pasemi/setup.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c index 1940e67..a89d098 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) srr0 = regs->nip; srr1 = regs->msr; - if (mpic_get_mcirq() == nmi_virq) { + if (nmi_virq != NO_IRQ && mpic_get_mcirq() == nmi_virq) { printk(KERN_ERR "NMI delivered\n"); debugger(regs); mpic_end_irq(nmi_virq); - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html