Merge branch 'pm-cpufreq'

[mirror_ubuntu-bionic-kernel.git] / include / linux / timekeeper_internal.h

diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h
index e88005459035e760cb2c3cf1dc8966a958191ef6..110f4532188c7b6c50cf1ce4dcd5dc525beae9a1 100644 (file)
--- a/include/linux/timekeeper_internal.h
+++ b/include/linux/timekeeper_internal.h
@@ -29,9 +29,9 @@
  */
 struct tk_read_base {
        struct clocksource      *clock;
-       cycle_t                 (*read)(struct clocksource *cs);
-       cycle_t                 mask;
-       cycle_t                 cycle_last;
+       u64                     (*read)(struct clocksource *cs);
+       u64                     mask;
+       u64                     cycle_last;
        u32                     mult;
        u32                     shift;
        u64                     xtime_nsec;
@@ -97,7 +97,7 @@ struct timekeeper {
        struct timespec64       raw_time;
 
        /* The following members are for timekeeping internal use */
-       cycle_t                 cycle_interval;
+       u64                     cycle_interval;
        u64                     xtime_interval;
        s64                     xtime_remainder;
        u32                     raw_interval;
@@ -136,7 +136,7 @@ extern void update_vsyscall_tz(void);
 
 extern void update_vsyscall_old(struct timespec *ts, struct timespec *wtm,
                                struct clocksource *c, u32 mult,
-                               cycle_t cycle_last);
+                               u64 cycle_last);
 extern void update_vsyscall_tz(void);
 
 #else