Commit 79816d4b authored by Samuel Wu's avatar Samuel Wu Committed by Rafael J. Wysocki
Browse files

Revert "PM: sleep: Make pm_wakeup_clear() call more clear" 



This reverts commit 56a232d9.

The above commit changed the position of pm_wakeup_clear() for the
suspend call path, but other call paths with references to
freeze_processes() were not updated. This means that other call
paths, such as hibernate(), will not have pm_wakeup_clear() called.

Suggested-by: default avatarSaravana Kannan <saravanak@google.com>
Signed-off-by: default avatarSamuel Wu <wusamuel@google.com>
[ rjw: Changelog edits ]
Link: https://patch.msgid.link/20251022222830.634086-1-wusamuel@google.com


Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 211ddde0

kernel/power/process.c

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ int freeze_processes(void) 
	if (!pm_freezing)

		static_branch_inc(&freezer_active);



	pm_wakeup_clear(0);

	pm_freezing = true;

	error = try_to_freeze_tasks(true);

	if (!error)

kernel/power/suspend.c

+0 −1
Original line number Diff line number Diff line
@@ -595,7 +595,6 @@ static int enter_state(suspend_state_t state) 
	}



	pm_pr_dbg("Preparing system for sleep (%s)\n", mem_sleep_labels[state]);

	pm_wakeup_clear(0);

	pm_suspend_clear_flags();

	error = suspend_prepare(state);

	if (error)