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.

Thomas Gleixner committed 8 years ago

Commit ed4bbf71 parent 89876f21 file · +1 −1Browse files

Unified · Split

kernel/time/timer.c+1−1

@@ -1696,7 +1696,7 @@ void run_local_timers(void) · 1695 unmodified lines
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++;