diff options
Diffstat (limited to 'kernel/hrtimer.c')
-rw-r--r-- | kernel/hrtimer.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 1069998fe25f..668f3967eb39 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
@@ -306,7 +306,7 @@ EXPORT_SYMBOL_GPL(ktime_sub_ns); | |||
306 | /* | 306 | /* |
307 | * Divide a ktime value by a nanosecond value | 307 | * Divide a ktime value by a nanosecond value |
308 | */ | 308 | */ |
309 | unsigned long ktime_divns(const ktime_t kt, s64 div) | 309 | u64 ktime_divns(const ktime_t kt, s64 div) |
310 | { | 310 | { |
311 | u64 dclc, inc, dns; | 311 | u64 dclc, inc, dns; |
312 | int sft = 0; | 312 | int sft = 0; |
@@ -321,7 +321,7 @@ unsigned long ktime_divns(const ktime_t kt, s64 div) | |||
321 | dclc >>= sft; | 321 | dclc >>= sft; |
322 | do_div(dclc, (unsigned long) div); | 322 | do_div(dclc, (unsigned long) div); |
323 | 323 | ||
324 | return (unsigned long) dclc; | 324 | return dclc; |
325 | } | 325 | } |
326 | #endif /* BITS_PER_LONG >= 64 */ | 326 | #endif /* BITS_PER_LONG >= 64 */ |
327 | 327 | ||
@@ -656,10 +656,9 @@ void unlock_hrtimer_base(const struct hrtimer *timer, unsigned long *flags) | |||
656 | * Forward the timer expiry so it will expire in the future. | 656 | * Forward the timer expiry so it will expire in the future. |
657 | * Returns the number of overruns. | 657 | * Returns the number of overruns. |
658 | */ | 658 | */ |
659 | unsigned long | 659 | u64 hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval) |
660 | hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval) | ||
661 | { | 660 | { |
662 | unsigned long orun = 1; | 661 | u64 orun = 1; |
663 | ktime_t delta; | 662 | ktime_t delta; |
664 | 663 | ||
665 | delta = ktime_sub(now, timer->expires); | 664 | delta = ktime_sub(now, timer->expires); |