LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [patch] clocksource, acpi_pm.c: put acpi_pm_read_slow() under CONFIG_PCI
@ 2008-11-05 19:40 Bjorn Helgaas
  0 siblings, 0 replies; only message in thread
From: Bjorn Helgaas @ 2008-11-05 19:40 UTC (permalink / raw)
  To: Thomas Gleixner; +Cc: Dominik Brodowski, linux-kernel, linux-acpi

acpi_pm_read_slow() is only used when CONFIG_PCI=y, so move the
definition inside the ifdef.

Otherwise this causes a "defined but not used" warning when
building with CONFIG_ACPI=y and CONFIG_PCI=n (that's not
supported yet, but it could be).

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>

diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c
index c201710..e1129fa 100644
--- a/drivers/clocksource/acpi_pm.c
+++ b/drivers/clocksource/acpi_pm.c
@@ -57,11 +57,6 @@ u32 acpi_pm_read_verified(void)
 	return v2;
 }
 
-static cycle_t acpi_pm_read_slow(void)
-{
-	return (cycle_t)acpi_pm_read_verified();
-}
-
 static cycle_t acpi_pm_read(void)
 {
 	return (cycle_t)read_pmtmr();
@@ -88,6 +83,11 @@ static int __init acpi_pm_good_setup(char *__str)
 }
 __setup("acpi_pm_good", acpi_pm_good_setup);
 
+static cycle_t acpi_pm_read_slow(void)
+{
+	return (cycle_t)acpi_pm_read_verified();
+}
+
 static inline void acpi_pm_need_workaround(void)
 {
 	clocksource_acpi_pm.read = acpi_pm_read_slow;

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-11-05 19:41 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-11-05 19:40 [patch] clocksource, acpi_pm.c: put acpi_pm_read_slow() under CONFIG_PCI Bjorn Helgaas

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).