All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] [POWERPC] pasemi: Fix NMI handling check
@ 2008-01-02 18:45 Olof Johansson
  0 siblings, 0 replies; only message in thread
From: Olof Johansson @ 2008-01-02 18:45 UTC (permalink / raw)
  To: linuxppc-dev

[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>


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);

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2008-01-02 18:37 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-02 18:45 [PATCH] [POWERPC] pasemi: Fix NMI handling check Olof Johansson

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.