diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2014-05-02 21:31:50 +0200 |
---|---|---|
committer | Anders Roxell <anders.roxell@linaro.org> | 2014-06-30 15:23:48 +0200 |
commit | 0cbd8a2041247e23ce09e99253c312027c76073e (patch) | |
tree | 8720da56f3a2efc69f5cc1aec61c49e98c0c0e60 /kernel | |
parent | 94a5f430d7cb73af7ac53a11d3487a2252977ae3 (diff) |
timer: do not spin_trylock() on UP
This will void a warning comming from the spin-lock debugging code. The
lock avoiding idea is from Steven Rostedt.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/timer.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 54596b5b3a48..875087538274 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1461,6 +1461,19 @@ void run_local_timers(void) * the timer softirq. */ #ifdef CONFIG_PREEMPT_RT_FULL + +#ifndef CONFIG_SMP + /* + * The spin_do_trylock() later may fail as the lock may be hold before + * the interrupt arrived. The spin-lock debugging code will raise a + * warning if the try_lock fails on UP. Since this is only an + * optimization for the FULL_NO_HZ case (not to run the timer softirq on + * an nohz_full CPU) we don't really care and shedule the softirq. + */ + raise_softirq(TIMER_SOFTIRQ); + return; +#endif + /* On RT, irq work runs from softirq */ if (irq_work_needs_cpu()) { raise_softirq(TIMER_SOFTIRQ); |