diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-01-16 02:33:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-01-16 02:33:42 +0100 |
| commit | 57957fb519449803df30d10da433c27aaad17fa5 (patch) | |
| tree | b7cf0ca9f4f8f630128afbc29de34cab93e50fa5 /kernel/time | |
| parent | a9445e47d897054876b8f43e46dc5a3eca2b844d (diff) | |
| parent | ed4bbf7910b28ce3c691aef28d245585eaabda06 (diff) | |
| download | linux-57957fb519449803df30d10da433c27aaad17fa5.tar.bz2 | |
Merge branch 'timers/urgent' into timers/core, to pick up dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/timer.c | 2 |
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) hrtimer_run_queues(); /* Raise the softirq only if required. */ if (time_before(jiffies, base->clk)) { - if (!IS_ENABLED(CONFIG_NO_HZ_COMMON) || !base->nohz_active) + if (!IS_ENABLED(CONFIG_NO_HZ_COMMON)) return; /* CPU is awake, so check the deferrable base. */ base++; |