Commit 506e6dfb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-5.19-rc9' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fix from Rafael Wysocki:
 "Make some false positive RCU splats resulting from a recent intel_idle
  driver change go away (Waiman Long)"

* tag 'pm-5.19-rc9' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  intel_idle: Fix false positive RCU splats due to incorrect hardirqs state
parents e4d8b09d d295ad34

drivers/idle/intel_idle.c

+7 −1
Original line number Diff line number Diff line
@@ -162,7 +162,13 @@ static __cpuidle int intel_idle_irq(struct cpuidle_device *dev, 


	raw_local_irq_enable();

	ret = __intel_idle(dev, drv, index);

	raw_local_irq_disable();



	/*

	 * The lockdep hardirqs state may be changed to 'on' with timer

	 * tick interrupt followed by __do_softirq(). Use local_irq_disable()

	 * to keep the hardirqs state correct.

	 */

	local_irq_disable();



	return ret;

}