aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/timer.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/timer.c')
-rw-r--r--kernel/timer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index c2a8ccfc2882..d38801a95866 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1624,7 +1624,7 @@ struct time_interpolator *time_interpolator __read_mostly;
1624static struct time_interpolator *time_interpolator_list __read_mostly; 1624static struct time_interpolator *time_interpolator_list __read_mostly;
1625static DEFINE_SPINLOCK(time_interpolator_lock); 1625static DEFINE_SPINLOCK(time_interpolator_lock);
1626 1626
1627static inline u64 time_interpolator_get_cycles(unsigned int src) 1627static inline cycles_t time_interpolator_get_cycles(unsigned int src)
1628{ 1628{
1629 unsigned long (*x)(void); 1629 unsigned long (*x)(void);
1630 1630
@@ -1650,8 +1650,8 @@ static inline u64 time_interpolator_get_counter(int writelock)
1650 1650
1651 if (time_interpolator->jitter) 1651 if (time_interpolator->jitter)
1652 { 1652 {
1653 u64 lcycle; 1653 cycles_t lcycle;
1654 u64 now; 1654 cycles_t now;
1655 1655
1656 do { 1656 do {
1657 lcycle = time_interpolator->last_cycle; 1657 lcycle = time_interpolator->last_cycle;