Skip to content

Commit 506e6df

Browse files
committed
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
2 parents e4d8b09 + d295ad3 commit 506e6df

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

drivers/idle/intel_idle.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,13 @@ static __cpuidle int intel_idle_irq(struct cpuidle_device *dev,
162162

163163
raw_local_irq_enable();
164164
ret = __intel_idle(dev, drv, index);
165-
raw_local_irq_disable();
165+
166+
/*
167+
* The lockdep hardirqs state may be changed to 'on' with timer
168+
* tick interrupt followed by __do_softirq(). Use local_irq_disable()
169+
* to keep the hardirqs state correct.
170+
*/
171+
local_irq_disable();
166172

167173
return ret;
168174
}

0 commit comments

Comments
 (0)