diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2014-05-02 21:31:50 +0200 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2014-07-01 12:01:14 -0400 |
commit | c919e36e6d54986d515aba18fda02a5bfaeebcc1 (patch) | |
tree | 74496f82dd228157016ade634372d0987ca79322 /kernel | |
parent | 50163a939e5248a17721142f5fdfe9a31accc64f (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.
Cc: stable-rt@vger.kernel.org
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Steven Rostedt <rostedt@goodmis.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 611a5973d9e1..3b79da2f9c67 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); |