Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc...

[linux-2.6-microblaze.git] / drivers / clocksource / acpi_pm.c

diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c
index 28037d0..1961e35 100644 (file)
--- a/drivers/clocksource/acpi_pm.c
+++ b/drivers/clocksource/acpi_pm.c
@@ -58,16 +58,16 @@ u32 acpi_pm_read_verified(void)
        return v2;
 }
 
-static cycle_t acpi_pm_read(struct clocksource *cs)
+static u64 acpi_pm_read(struct clocksource *cs)
 {
-       return (cycle_t)read_pmtmr();
+       return (u64)read_pmtmr();
 }
 
 static struct clocksource clocksource_acpi_pm = {
        .name           = "acpi_pm",
        .rating         = 200,
        .read           = acpi_pm_read,
-       .mask           = (cycle_t)ACPI_PM_MASK,
+       .mask           = (u64)ACPI_PM_MASK,
        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -81,9 +81,9 @@ static int __init acpi_pm_good_setup(char *__str)
 }
 __setup("acpi_pm_good", acpi_pm_good_setup);
 
-static cycle_t acpi_pm_read_slow(struct clocksource *cs)
+static u64 acpi_pm_read_slow(struct clocksource *cs)
 {
-       return (cycle_t)acpi_pm_read_verified();
+       return (u64)acpi_pm_read_verified();
 }
 
 static inline void acpi_pm_need_workaround(void)
@@ -145,7 +145,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_LE,
  */
 static int verify_pmtmr_rate(void)
 {
-       cycle_t value1, value2;
+       u64 value1, value2;
        unsigned long count, delta;
 
        mach_prepare_counter();
@@ -175,7 +175,7 @@ static int verify_pmtmr_rate(void)
 
 static int __init init_acpi_pm_clocksource(void)
 {
-       cycle_t value1, value2;
+       u64 value1, value2;
        unsigned int i, j = 0;
 
        if (!pmtmr_ioport)