diff options
Diffstat (limited to 'drivers/clocksource/acpi_pm.c')
-rw-r--r-- | drivers/clocksource/acpi_pm.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c index 28037d0b8dcd..1961e3539b57 100644 --- a/drivers/clocksource/acpi_pm.c +++ b/drivers/clocksource/acpi_pm.c | |||
@@ -58,16 +58,16 @@ u32 acpi_pm_read_verified(void) | |||
58 | return v2; | 58 | return v2; |
59 | } | 59 | } |
60 | 60 | ||
61 | static cycle_t acpi_pm_read(struct clocksource *cs) | 61 | static u64 acpi_pm_read(struct clocksource *cs) |
62 | { | 62 | { |
63 | return (cycle_t)read_pmtmr(); | 63 | return (u64)read_pmtmr(); |
64 | } | 64 | } |
65 | 65 | ||
66 | static struct clocksource clocksource_acpi_pm = { | 66 | static struct clocksource clocksource_acpi_pm = { |
67 | .name = "acpi_pm", | 67 | .name = "acpi_pm", |
68 | .rating = 200, | 68 | .rating = 200, |
69 | .read = acpi_pm_read, | 69 | .read = acpi_pm_read, |
70 | .mask = (cycle_t)ACPI_PM_MASK, | 70 | .mask = (u64)ACPI_PM_MASK, |
71 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 71 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
72 | }; | 72 | }; |
73 | 73 | ||
@@ -81,9 +81,9 @@ static int __init acpi_pm_good_setup(char *__str) | |||
81 | } | 81 | } |
82 | __setup("acpi_pm_good", acpi_pm_good_setup); | 82 | __setup("acpi_pm_good", acpi_pm_good_setup); |
83 | 83 | ||
84 | static cycle_t acpi_pm_read_slow(struct clocksource *cs) | 84 | static u64 acpi_pm_read_slow(struct clocksource *cs) |
85 | { | 85 | { |
86 | return (cycle_t)acpi_pm_read_verified(); | 86 | return (u64)acpi_pm_read_verified(); |
87 | } | 87 | } |
88 | 88 | ||
89 | static inline void acpi_pm_need_workaround(void) | 89 | 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, | |||
145 | */ | 145 | */ |
146 | static int verify_pmtmr_rate(void) | 146 | static int verify_pmtmr_rate(void) |
147 | { | 147 | { |
148 | cycle_t value1, value2; | 148 | u64 value1, value2; |
149 | unsigned long count, delta; | 149 | unsigned long count, delta; |
150 | 150 | ||
151 | mach_prepare_counter(); | 151 | mach_prepare_counter(); |
@@ -175,7 +175,7 @@ static int verify_pmtmr_rate(void) | |||
175 | 175 | ||
176 | static int __init init_acpi_pm_clocksource(void) | 176 | static int __init init_acpi_pm_clocksource(void) |
177 | { | 177 | { |
178 | cycle_t value1, value2; | 178 | u64 value1, value2; |
179 | unsigned int i, j = 0; | 179 | unsigned int i, j = 0; |
180 | 180 | ||
181 | if (!pmtmr_ioport) | 181 | if (!pmtmr_ioport) |