From: Samuel Wu Date: Wed, 22 Oct 2025 22:28:30 +0000 (+0000) Subject: Revert "PM: sleep: Make pm_wakeup_clear() call more clear" X-Git-Tag: v6.18-rc4~22^2^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79816d4b9e9b9bb03d5d871c04c97b1bce102b14;p=thirdparty%2Fkernel%2Flinux.git Revert "PM: sleep: Make pm_wakeup_clear() call more clear" This reverts commit 56a232d93cea0ba14da5e3157830330756a45b4c. 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: Saravana Kannan Signed-off-by: Samuel Wu [ rjw: Changelog edits ] Link: https://patch.msgid.link/20251022222830.634086-1-wusamuel@google.com Signed-off-by: Rafael J. Wysocki --- diff --git a/kernel/power/process.c b/kernel/power/process.c index 8ff68ebaa1e08..dc0dfc349f22b 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c @@ -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) diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 4bb4686c1c088..b4ca17c2fecf4 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -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)