diff options
Diffstat (limited to 'kernel/hrtimer.c')
-rw-r--r-- | kernel/hrtimer.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index ae34bf51682..3c24fb2c25c 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
@@ -717,6 +717,19 @@ static int hrtimer_switch_to_hres(void) | |||
717 | return 1; | 717 | return 1; |
718 | } | 718 | } |
719 | 719 | ||
720 | /* | ||
721 | * Called from timekeeping code to reprogramm the hrtimer interrupt | ||
722 | * device. If called from the timer interrupt context we defer it to | ||
723 | * softirq context. | ||
724 | */ | ||
725 | void clock_was_set_delayed(void) | ||
726 | { | ||
727 | struct hrtimer_cpu_base *cpu_base = &__get_cpu_var(hrtimer_bases); | ||
728 | |||
729 | cpu_base->clock_was_set = 1; | ||
730 | __raise_softirq_irqoff(HRTIMER_SOFTIRQ); | ||
731 | } | ||
732 | |||
720 | #else | 733 | #else |
721 | 734 | ||
722 | static inline int hrtimer_hres_active(void) { return 0; } | 735 | static inline int hrtimer_hres_active(void) { return 0; } |
@@ -1395,6 +1408,13 @@ void hrtimer_peek_ahead_timers(void) | |||
1395 | 1408 | ||
1396 | static void run_hrtimer_softirq(struct softirq_action *h) | 1409 | static void run_hrtimer_softirq(struct softirq_action *h) |
1397 | { | 1410 | { |
1411 | struct hrtimer_cpu_base *cpu_base = &__get_cpu_var(hrtimer_bases); | ||
1412 | |||
1413 | if (cpu_base->clock_was_set) { | ||
1414 | cpu_base->clock_was_set = 0; | ||
1415 | clock_was_set(); | ||
1416 | } | ||
1417 | |||
1398 | hrtimer_peek_ahead_timers(); | 1418 | hrtimer_peek_ahead_timers(); |
1399 | } | 1419 | } |
1400 | 1420 | ||