diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-31 18:01:23 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-31 20:30:20 +0900 |
| commit | 339dedf709e21d5718d6596750166f70e8bed40a (patch) | |
| tree | f4fab2933bd90211d3f62141f068b90060cd90f0 | |
| parent | 55922c9d1b84b89cb946c777fddccb3247e7df2c (diff) | |
| download | linux-3.10-339dedf709e21d5718d6596750166f70e8bed40a.tar.gz linux-3.10-339dedf709e21d5718d6596750166f70e8bed40a.tar.bz2 linux-3.10-339dedf709e21d5718d6596750166f70e8bed40a.zip | |
powerpc/pmac: Don't register pmac PIC syscore ops when HW not present
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 <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/powerpc/platforms/powermac/pic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c index 9089b042119..7667db448aa 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; } |