projects/linux·commit 339dedf7

powerpc/pmac: Don't register pmac PIC syscore ops when HW not present

339dedf7 · Benjamin Herrenschmidt <[email protected]> · 2011-05-31 18:01:23 +10:00

The Apple custom PIC only exist in some earlier machine models,
anything with an MPIC will crash on suspend if we register those
syscore ops unconditionally.

This is a regression caused by commit f5a592f7d74e ("PM / PowerPC: Use
struct syscore_ops instead of sysdevs for PM")

Signed-off-by: Benjamin Herrenschmidt <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
339dedf709e21d5718d6596750166f70e8bed40a
Parents
55922c9d

Changes

1 files changed · +2 −1

FileStatusAddDelContent
arch/powerpc/platforms/powermac/pic.cmodified+2−1View file

arch/powerpc/platforms/powermac/pic.c

View file
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 9089b04..7667db4 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -715,7 +715,8 @@ static struct syscore_ops pmacpic_syscore_ops = {
static int __init init_pmacpic_syscore(void)
{
- register_syscore_ops(&pmacpic_syscore_ops);
+ if (pmac_irq_hw[0])
+ register_syscore_ops(&pmacpic_syscore_ops);
return 0;
}