The patch titled
clocksource, acpi_pm.c: put acpi_pm_read_slow() under CONFIG_PCI
has been removed from the -mm tree. Its filename was
clocksource-acpi_pmc-put-acpi_pm_read_slow-under-config_pci.patch
This patch was dropped because it conflicts with changes in the acpi tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: clocksource, acpi_pm.c: put acpi_pm_read_slow() under CONFIG_PCI
From: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
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@xxxxxx>
Cc: Dominik Brodowski <linux@xxxxxxxxxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/clocksource/acpi_pm.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff -puN drivers/clocksource/acpi_pm.c~clocksource-acpi_pmc-put-acpi_pm_read_slow-under-config_pci drivers/clocksource/acpi_pm.c
--- a/drivers/clocksource/acpi_pm.c~clocksource-acpi_pmc-put-acpi_pm_read_slow-under-config_pci
+++ a/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(cha
}
__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;
_
Patches currently in -mm which might be from bjorn.helgaas@xxxxxx are
linux-next.patch
mm-only-enforce-acpi-resource-conflict-checks.patch
clocksource-acpi_pmc-put-acpi_pm_read_slow-under-config_pci.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
