From: Peter Zijlstra <pet...@infradead.org> [ Upstream commit 49d9c5936314e44d314c605c39cce0fd947f9c3a ]
Match the pattern elsewhere in this file. Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org> Reviewed-by: Steven Rostedt (VMware) <rost...@goodmis.org> Reviewed-by: Thomas Gleixner <t...@linutronix.de> Acked-by: Rafael J. Wysocki <rafael.j.wyso...@intel.com> Tested-by: Marco Elver <el...@google.com> Link: https://lkml.kernel.org/r/20200821085348.251340...@infradead.org Signed-off-by: Sasha Levin <sas...@kernel.org> --- drivers/cpuidle/cpuidle.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index 6df894d65d9e2..2d182dc1b49ed 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -148,7 +148,8 @@ static void enter_s2idle_proper(struct cpuidle_driver *drv, */ stop_critical_timings(); drv->states[index].enter_s2idle(dev, drv, index); - WARN_ON(!irqs_disabled()); + if (WARN_ON_ONCE(!irqs_disabled())) + local_irq_disable(); /* * timekeeping_resume() that will be called by tick_unfreeze() for the * first CPU executing it calls functions containing RCU read-side -- 2.25.1
