aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2018-01-14 17:19:49 -0500
committerThomas Gleixner <tglx@linutronix.de>2018-01-14 17:25:33 -0500
commited4bbf7910b28ce3c691aef28d245585eaabda06 (patch)
tree6a1e3909749183351cd6d6482e1d908a7f776ab2
parent89876f275e8d562912d9c238cd888b52065cf25c (diff)
timers: Unconditionally check deferrable base
When the timer base is checked for expired timers then the deferrable base must be checked as well. This was missed when making the deferrable base independent of base::nohz_active. Fixes: ced6d5c11d3e ("timers: Use deferrable base independent of base::nohz_active") Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Anna-Maria Gleixner <anna-maria@linutronix.de> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Sebastian Siewior <bigeasy@linutronix.de> Cc: Paul McKenney <paulmck@linux.vnet.ibm.com> Cc: stable@vger.kernel.org Cc: rt@linutronix.de
-rw-r--r--kernel/time/timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 89a9e1b4264a..0bcf00e3ce48 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1696,7 +1696,7 @@ void run_local_timers(void)
1696 hrtimer_run_queues(); 1696 hrtimer_run_queues();
1697 /* Raise the softirq only if required. */ 1697 /* Raise the softirq only if required. */
1698 if (time_before(jiffies, base->clk)) { 1698 if (time_before(jiffies, base->clk)) {
1699 if (!IS_ENABLED(CONFIG_NO_HZ_COMMON) || !base->nohz_active) 1699 if (!IS_ENABLED(CONFIG_NO_HZ_COMMON))
1700 return; 1700 return;
1701 /* CPU is awake, so check the deferrable base. */ 1701 /* CPU is awake, so check the deferrable base. */
1702 base++; 1702 base++;