Skip to content

Commit

Permalink
powerpc: Fix mpic_resume on early G5 macs
Browse files Browse the repository at this point in the history
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 suspend-to-disk with one processor (maxcpus=1) for me.

Signed-off-by: Alastair Bridgewater <alastair.bridgewater@gmail.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Alastair Bridgewater authored and Benjamin Herrenschmidt committed Jun 15, 2010
1 parent bd2b64a commit 7c9d936
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/powerpc/sysdev/mpic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 7c9d936

Please sign in to comment.