Commit 136eb5fd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2ae9a897 3c89a068

kernel/power/suspend.c

+6 −0
Original line number Diff line number Diff line
@@ -106,6 +106,12 @@ static void s2idle_enter(void) 
	swait_event_exclusive(s2idle_wait_head,

		    s2idle_state == S2IDLE_STATE_WAKE);



	/*

	 * Kick all CPUs to ensure that they resume their timers and restore

	 * consistent system state.

	 */

	wake_up_all_idle_cpus();



	cpus_read_unlock();



	raw_spin_lock_irq(&s2idle_lock);