From: Olaf Hering <olh@suse.de>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
linuxppc-dev@ozlabs.org
Subject: [PATCH] pmu_register_sleep_notifier needs ADB_PMU
Date: Sat, 22 Oct 2005 23:32:06 +0200 [thread overview]
Message-ID: <20051022213206.GB6097@suse.de> (raw)
a simple patch for a pegsos user:
https://bugzilla.novell.com/show_bug.cgi?id=119606
arch/ppc/platforms/built-in.o(.init.text+0x10a4): In function `core99_wake_up':
: undefined reference to `pmu_register_sleep_notifier'
make[1]: *** [.tmp_vmlinux1] Error 1
Signed-off-by: Olaf Hering <olh@suse.de>
arch/ppc/platforms/pmac_sleep.S | 2 +-
arch/ppc/platforms/pmac_time.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Index: linux-2.6.14-rc5/arch/ppc/platforms/pmac_sleep.S
===================================================================
--- linux-2.6.14-rc5.orig/arch/ppc/platforms/pmac_sleep.S
+++ linux-2.6.14-rc5/arch/ppc/platforms/pmac_sleep.S
@@ -46,7 +46,7 @@
.section .text
.align 5
-#if defined(CONFIG_PM) || defined(CONFIG_CPU_FREQ_PMAC)
+#if (defined(CONFIG_PM) || defined(CONFIG_CPU_FREQ_PMAC)) && defined(CONFIG_ADB_PMU)
/* This gets called by via-pmu.c late during the sleep process.
* The PMU was already send the sleep command and will shut us down
Index: linux-2.6.14-rc5/arch/ppc/platforms/pmac_time.c
===================================================================
--- linux-2.6.14-rc5.orig/arch/ppc/platforms/pmac_time.c
+++ linux-2.6.14-rc5/arch/ppc/platforms/pmac_time.c
@@ -206,7 +206,7 @@ via_calibrate_decr(void)
return 1;
}
-#ifdef CONFIG_PM
+#if defined(CONFIG_PM) && defined(CONFIG_ADB_PMU)
/*
* Reset the time after a sleep.
*/
@@ -251,7 +251,7 @@ pmac_calibrate_decr(void)
struct device_node *cpu;
unsigned int freq, *fp;
-#ifdef CONFIG_PM
+#if defined(CONFIG_PM) && defined(CONFIG_ADB_PMU)
pmu_register_sleep_notifier(&time_sleep_notifier);
#endif /* CONFIG_PM */
--
short story of a lazy sysadmin:
alias appserv=wotan
next reply other threads:[~2005-10-22 21:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-10-22 21:32 Olaf Hering [this message]
2005-11-16 16:38 ` [PATCH] pmu_register_sleep_notifier needs ADB_PMU Olaf Hering
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=20051022213206.GB6097@suse.de \
--to=olh@suse.de \
--cc=benh@kernel.crashing.org \
--cc=linuxppc-dev@ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).