diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 20:08:38 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:38:28 (GMT) |
| commit | d6b8f4a6bb6eedaa4a30fd55acd147a246add9f0 (patch) | |
| tree | de35a2324a195367cb09d46192a1e4636e4f5e65 /kernel/timer.c | |
| parent | 13e88d8d6ebf00afd80988c323c3892021767e25 (diff) | |
| download | linux-fsl-qoriq-d6b8f4a6bb6eedaa4a30fd55acd147a246add9f0.tar.xz | |
timer-handle-idle-trylock-in-get-next-timer-irq.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 4cb850d..bbe6d43 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1386,9 +1386,10 @@ unsigned long get_next_timer_interrupt(unsigned long now) /* * On PREEMPT_RT we cannot sleep here. If the trylock does not * succeed then we return the worst-case 'expires in 1 tick' - * value: + * value. We use the rt functions here directly to avoid a + * migrate_disable() call. */ - if (!spin_trylock(&base->lock)) + if (!spin_do_trylock(&base->lock)) return now + 1; #else spin_lock(&base->lock); @@ -1398,7 +1399,11 @@ unsigned long get_next_timer_interrupt(unsigned long now) base->next_timer = __next_timer_interrupt(base); expires = base->next_timer; } +#ifdef CONFIG_PREEMPT_RT_FULL + rt_spin_unlock(&base->lock); +#else spin_unlock(&base->lock); +#endif if (time_before_eq(expires, now)) return now; |