diff options
Diffstat (limited to 'kernel/hrtimer.c')
| -rw-r--r-- | kernel/hrtimer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 04ccab099e84..f1c4155b49ac 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
| @@ -272,7 +272,7 @@ void unlock_hrtimer_base(const struct hrtimer *timer, unsigned long *flags) | |||
| 272 | * @interval: the interval to forward | 272 | * @interval: the interval to forward |
| 273 | * | 273 | * |
| 274 | * Forward the timer expiry so it will expire in the future. | 274 | * Forward the timer expiry so it will expire in the future. |
| 275 | * The number of overruns is added to the overrun field. | 275 | * Returns the number of overruns. |
| 276 | */ | 276 | */ |
| 277 | unsigned long | 277 | unsigned long |
| 278 | hrtimer_forward(struct hrtimer *timer, ktime_t interval) | 278 | hrtimer_forward(struct hrtimer *timer, ktime_t interval) |
| @@ -641,7 +641,8 @@ schedule_hrtimer_interruptible(struct hrtimer *timer, | |||
| 641 | static long __sched | 641 | static long __sched |
| 642 | nanosleep_restart(struct restart_block *restart, clockid_t clockid) | 642 | nanosleep_restart(struct restart_block *restart, clockid_t clockid) |
| 643 | { | 643 | { |
| 644 | struct timespec __user *rmtp, tu; | 644 | struct timespec __user *rmtp; |
| 645 | struct timespec tu; | ||
| 645 | void *rfn_save = restart->fn; | 646 | void *rfn_save = restart->fn; |
| 646 | struct hrtimer timer; | 647 | struct hrtimer timer; |
| 647 | ktime_t rem; | 648 | ktime_t rem; |
