openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 f5a592f7d7 ("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>
This commit is contained in:
Benjamin Herrenschmidt 2011-05-31 18:01:23 +10:00 committed by Linus Torvalds
parent 55922c9d1b
commit 339dedf709
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/powerpc/platforms/powermac/pic.c
View File

@ -715,7 +715,8 @@ static struct syscore_ops pmacpic_syscore_ops = {
static int __init init_pmacpic_syscore(void) 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; return 0;
} }