linux-kernel - [patch] clocksource, acpi_pm.c: put acpi_pm_read_slow() under CONFIG

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Wed, 5 Nov 2008 13:40:57 -0600
From:	Bjorn Helgaas <bjorn.helgaas@...com>
To:	Thomas Gleixner <tglx@...utronix.de>
Cc:	Dominik Brodowski <linux@...inikbrodowski.net>,
	linux-kernel@...r.kernel.org, linux-acpi@...r.kernel.org
Subject: [patch] clocksource, acpi_pm.c: put acpi_pm_read_slow() under CONFIG_PCI

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@...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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/