aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/hrtimer.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/hrtimer.h')
-rw-r--r--include/linux/hrtimer.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 3fed27c88c01..8371b664b41f 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -301,12 +301,12 @@ static inline int hrtimer_is_queued(struct hrtimer *timer)
301} 301}
302 302
303/* Forward a hrtimer so it expires after now: */ 303/* Forward a hrtimer so it expires after now: */
304extern unsigned long 304extern u64
305hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval); 305hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval);
306 306
307/* Forward a hrtimer so it expires after the hrtimer's current now */ 307/* Forward a hrtimer so it expires after the hrtimer's current now */
308static inline unsigned long hrtimer_forward_now(struct hrtimer *timer, 308static inline u64 hrtimer_forward_now(struct hrtimer *timer,
309 ktime_t interval) 309 ktime_t interval)
310{ 310{
311 return hrtimer_forward(timer, timer->base->get_time(), interval); 311 return hrtimer_forward(timer, timer->base->get_time(), interval);
312} 312}
@@ -329,9 +329,9 @@ extern void hrtimer_run_pending(void);
329extern void __init hrtimers_init(void); 329extern void __init hrtimers_init(void);
330 330
331#if BITS_PER_LONG < 64 331#if BITS_PER_LONG < 64
332extern unsigned long ktime_divns(const ktime_t kt, s64 div); 332extern u64 ktime_divns(const ktime_t kt, s64 div);
333#else /* BITS_PER_LONG < 64 */ 333#else /* BITS_PER_LONG < 64 */
334# define ktime_divns(kt, div) (unsigned long)((kt).tv64 / (div)) 334# define ktime_divns(kt, div) (u64)((kt).tv64 / (div))
335#endif 335#endif
336 336
337/* Show pending timers: */ 337/* Show pending timers: */