From: Benjamin Herrenschmidt <benh@kernel•crashing.org>
To: Linus Torvalds <torvalds@linux-foundation•org>
Cc: "Rafael J. Wysocki" <rjw@sisk•pl>,
linuxppc-dev <linuxppc-dev@lists•ozlabs.org>
Subject: [PATCH] powerpc/pmac: Don't register pmac PIC syscore ops when HW not present
Date: Tue, 31 May 2011 18:01:23 +1000 [thread overview]
Message-ID: <1306828883.7481.663.camel@pasglop> (raw)
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:
f5a592f7d74e38c5007876c731e6bf5580072e63
PM / PowerPC: Use struct syscore_ops instead of sysdevs for PM
Signed-off-by: Benjamin Herrenschmidt <benh@kernel•crashing.org>
---
Linus, can you just pop that in ? I can put it in a git tree tomorrow
if you prefer...
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 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;
}
reply other threads:[~2011-05-31 8:01 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1306828883.7481.663.camel@pasglop \
--to=benh@kernel$(echo .)crashing.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=rjw@sisk$(echo .)pl \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox