From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A1C50B7D66 for ; Tue, 15 Jun 2010 15:05:04 +1000 (EST) Subject: Re: [PATCH] powerpc: Fix mpic_resume on early G5 macs From: Benjamin Herrenschmidt To: Alastair Bridgewater In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Date: Tue, 15 Jun 2010 15:04:55 +1000 Message-ID: <1276578295.2552.85.camel@pasglop> Mime-Version: 1.0 Cc: linuxppc-dev@ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Sat, 2010-06-12 at 21:36 -0400, Alastair Bridgewater wrote: > mpic_resume() on G5 macs blindly dereferences mpic->fixups, but > it may legitimately be NULL (as on PowerMac7,2). Add an explicit > check. > > This fixes susend-to-disk with one processor (maxcpus=1) for me. Thanks. Patch is terribly mangled tho (word wrapped and tabs have been replaced with spaces). I fixed it up manually but check your email setup next time. Cheers, Ben. > Signed-off-by: Alastair Bridgewater > --- > diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c > index 4fd57ab..28668ba 100644 > --- a/arch/powerpc/sysdev/mpic.c > +++ b/arch/powerpc/sysdev/mpic.c > @@ -1666,7 +1666,7 @@ static int mpic_resume(struct sys_device *dev) > mpic->save_data[i].dest); > > #ifdef CONFIG_MPIC_U3_HT_IRQS > - { > + if (mpic->fixups) { > struct mpic_irq_fixup *fixup = &mpic->fixups[i]; > > if (fixup->base) { > _______________________________________________ > Linuxppc-dev mailing list > Linuxppc-dev@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/linuxppc-dev