diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-07-03 08:30:20 -0500 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-02-15 10:32:44 -0600 |
| commit | ae3e7461684e5cba435b54f7b75c6ecfbc23aaf6 (patch) | |
| tree | ff6015daf3f4df01f85f543a58d62a9e71f71cc5 /kernel | |
| parent | 2d6837e95a31868f1db3e79367e91c70c7d9dfb5 (diff) | |
timers: preempt-rt support
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/timer.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index e4b237370b93..2aa1215dc63f 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1294,6 +1294,22 @@ unsigned long get_next_timer_interrupt(unsigned long now) */ if (cpu_is_offline(smp_processor_id())) return now + NEXT_TIMER_MAX_DELTA; + +#ifdef CONFIG_PREEMPT_RT_FULL + /* + * On PREEMPT_RT we cannot sleep here. If the trylock does not + * succeed then we return the worst-case 'expires in 1 tick' + * value: + */ + if (spin_trylock(&base->lock)) { + if (time_before_eq(base->next_timer, base->timer_jiffies)) + base->next_timer = __next_timer_interrupt(base); + expires = base->next_timer; + spin_unlock(&base->lock); + } else { + expires = now + 1; + } +#else spin_lock(&base->lock); if (time_before_eq(base->next_timer, base->timer_jiffies)) base->next_timer = __next_timer_interrupt(base); @@ -1302,7 +1318,7 @@ unsigned long get_next_timer_interrupt(unsigned long now) if (time_before_eq(expires, now)) return now; - +#endif return cmp_next_hrtimer_event(now, expires); } #endif |