diff options
Diffstat (limited to 'kernel/hrtimer.c')
-rw-r--r-- | kernel/hrtimer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index b2b2c2b0a49b..b6d2ff7e37ee 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
@@ -412,7 +412,7 @@ static int hrtimer_reprogram(struct hrtimer *timer, | |||
412 | /* | 412 | /* |
413 | * When the callback is running, we do not reprogram the clock event | 413 | * When the callback is running, we do not reprogram the clock event |
414 | * device. The timer callback is either running on a different CPU or | 414 | * device. The timer callback is either running on a different CPU or |
415 | * the callback is executed in the hrtimer_interupt context. The | 415 | * the callback is executed in the hrtimer_interrupt context. The |
416 | * reprogramming is handled either by the softirq, which called the | 416 | * reprogramming is handled either by the softirq, which called the |
417 | * callback or at the end of the hrtimer_interrupt. | 417 | * callback or at the end of the hrtimer_interrupt. |
418 | */ | 418 | */ |
@@ -638,7 +638,7 @@ void __timer_stats_hrtimer_set_start_info(struct hrtimer *timer, void *addr) | |||
638 | #endif | 638 | #endif |
639 | 639 | ||
640 | /* | 640 | /* |
641 | * Counterpart to lock_timer_base above: | 641 | * Counterpart to lock_hrtimer_base above: |
642 | */ | 642 | */ |
643 | static inline | 643 | static inline |
644 | void unlock_hrtimer_base(const struct hrtimer *timer, unsigned long *flags) | 644 | void unlock_hrtimer_base(const struct hrtimer *timer, unsigned long *flags) |