Skip to content

Commit 136eb5f

Browse files
committed
Merge tag 'pm-6.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fix from Rafael Wysocki: "Fix the suspend-to-idle core code to guarantee that timers queued on CPUs other than the one that has first left the idle state, which should expire directly after resume, will be handled (Anna-Maria Behnsen)" * tag 'pm-6.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: PM: s2idle: Make sure CPUs will wakeup directly on resume
2 parents 2ae9a89 + 3c89a06 commit 136eb5f

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

kernel/power/suspend.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,12 @@ static void s2idle_enter(void)
106106
swait_event_exclusive(s2idle_wait_head,
107107
s2idle_state == S2IDLE_STATE_WAKE);
108108

109+
/*
110+
* Kick all CPUs to ensure that they resume their timers and restore
111+
* consistent system state.
112+
*/
113+
wake_up_all_idle_cpus();
114+
109115
cpus_read_unlock();
110116

111117
raw_spin_lock_irq(&s2idle_lock);

0 commit comments

Comments
 (0)