diff options
Diffstat (limited to 'include/linux/hrtimer.h')
| -rw-r--r-- | include/linux/hrtimer.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index 2ead22dd74a0..c98c6539e2c2 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h | |||
| @@ -220,7 +220,7 @@ static inline void hrtimer_set_expires_range(struct hrtimer *timer, ktime_t time | |||
| 220 | timer->node.expires = ktime_add_safe(time, delta); | 220 | timer->node.expires = ktime_add_safe(time, delta); |
| 221 | } | 221 | } |
| 222 | 222 | ||
| 223 | static inline void hrtimer_set_expires_range_ns(struct hrtimer *timer, ktime_t time, unsigned long delta) | 223 | static inline void hrtimer_set_expires_range_ns(struct hrtimer *timer, ktime_t time, u64 delta) |
| 224 | { | 224 | { |
| 225 | timer->_softexpires = time; | 225 | timer->_softexpires = time; |
| 226 | timer->node.expires = ktime_add_safe(time, ns_to_ktime(delta)); | 226 | timer->node.expires = ktime_add_safe(time, ns_to_ktime(delta)); |
| @@ -378,7 +378,7 @@ static inline void destroy_hrtimer_on_stack(struct hrtimer *timer) { } | |||
| 378 | 378 | ||
| 379 | /* Basic timer operations: */ | 379 | /* Basic timer operations: */ |
| 380 | extern void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, | 380 | extern void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, |
| 381 | unsigned long range_ns, const enum hrtimer_mode mode); | 381 | u64 range_ns, const enum hrtimer_mode mode); |
| 382 | 382 | ||
| 383 | /** | 383 | /** |
| 384 | * hrtimer_start - (re)start an hrtimer on the current CPU | 384 | * hrtimer_start - (re)start an hrtimer on the current CPU |
| @@ -399,7 +399,7 @@ extern int hrtimer_try_to_cancel(struct hrtimer *timer); | |||
| 399 | static inline void hrtimer_start_expires(struct hrtimer *timer, | 399 | static inline void hrtimer_start_expires(struct hrtimer *timer, |
| 400 | enum hrtimer_mode mode) | 400 | enum hrtimer_mode mode) |
| 401 | { | 401 | { |
| 402 | unsigned long delta; | 402 | u64 delta; |
| 403 | ktime_t soft, hard; | 403 | ktime_t soft, hard; |
| 404 | soft = hrtimer_get_softexpires(timer); | 404 | soft = hrtimer_get_softexpires(timer); |
| 405 | hard = hrtimer_get_expires(timer); | 405 | hard = hrtimer_get_expires(timer); |
| @@ -477,10 +477,12 @@ extern long hrtimer_nanosleep_restart(struct restart_block *restart_block); | |||
| 477 | extern void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, | 477 | extern void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, |
| 478 | struct task_struct *tsk); | 478 | struct task_struct *tsk); |
| 479 | 479 | ||
| 480 | extern int schedule_hrtimeout_range(ktime_t *expires, unsigned long delta, | 480 | extern int schedule_hrtimeout_range(ktime_t *expires, u64 delta, |
| 481 | const enum hrtimer_mode mode); | 481 | const enum hrtimer_mode mode); |
| 482 | extern int schedule_hrtimeout_range_clock(ktime_t *expires, | 482 | extern int schedule_hrtimeout_range_clock(ktime_t *expires, |
| 483 | unsigned long delta, const enum hrtimer_mode mode, int clock); | 483 | u64 delta, |
| 484 | const enum hrtimer_mode mode, | ||
| 485 | int clock); | ||
| 484 | extern int schedule_hrtimeout(ktime_t *expires, const enum hrtimer_mode mode); | 486 | extern int schedule_hrtimeout(ktime_t *expires, const enum hrtimer_mode mode); |
| 485 | 487 | ||
| 486 | /* Soft interrupt function to run the hrtimer queues: */ | 488 | /* Soft interrupt function to run the hrtimer queues: */ |
