Commit 7059b366 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

sched: idle: Avoid retaining the tick when it has been stopped 



If the tick has been stopped already, but the governor has not asked to
stop it (which it can do sometimes), the idle loop should invoke
tick_nohz_idle_stop_tick(), to let tick_nohz_stop_tick() take care
of this case properly.

Fixes: 554c8aa8 (sched: idle: Select idle state before stopping the tick)
Cc: 4.17+ <stable@vger.kernel.org> # 4.17+
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 50f7ccc6

kernel/sched/idle.c

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static void cpuidle_idle_call(void) 
		 */

		next_state = cpuidle_select(drv, dev, &stop_tick);



		if (stop_tick)

		if (stop_tick || tick_nohz_tick_stopped())

			tick_nohz_idle_stop_tick();

		else

			tick_nohz_idle_retain_tick();