diff options
| author | Alastair Bridgewater <alastair.bridgewater@gmail.com> | 2010-06-12 15:36:48 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-06-15 15:02:37 +1000 |
| commit | 7c9d93604b25c25dc059e2b12ad5e89ca3ed4376 (patch) | |
| tree | c90754b945d510aa7e7eada626814e0ce33812e3 /arch | |
| parent | bd2b64a12bf55bec0d1b949e3dca3f8863409646 (diff) | |
| download | linux-stable-7c9d93604b25c25dc059e2b12ad5e89ca3ed4376.tar.gz linux-stable-7c9d93604b25c25dc059e2b12ad5e89ca3ed4376.tar.bz2 linux-stable-7c9d93604b25c25dc059e2b12ad5e89ca3ed4376.zip | |
powerpc: Fix mpic_resume on early G5 macs
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/sysdev/mpic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index 2102487612a4..20b73c025a45 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) { |