Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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@hp.com>
Cc: mingo@elte.hu
Cc: johnstul@us.ibm.com
Cc: akpm@linux-foundation.org
Cc: bjorn.helgaas@hp.com
Cc: lenb@kernel.org
Cc: linux@dominikbrodowski.net
Cc: tglx@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Bjorn Helgaas and committed by
Thomas Gleixner
0a57b783 6c34bc29

+5 -5
+5 -5
drivers/clocksource/acpi_pm.c
··· 57 57 return v2; 58 58 } 59 59 60 - static cycle_t acpi_pm_read_slow(void) 61 - { 62 - return (cycle_t)acpi_pm_read_verified(); 63 - } 64 - 65 60 static cycle_t acpi_pm_read(void) 66 61 { 67 62 return (cycle_t)read_pmtmr(); ··· 82 87 return 1; 83 88 } 84 89 __setup("acpi_pm_good", acpi_pm_good_setup); 90 + 91 + static cycle_t acpi_pm_read_slow(void) 92 + { 93 + return (cycle_t)acpi_pm_read_verified(); 94 + } 85 95 86 96 static inline void acpi_pm_need_workaround(void) 87 97 {