Skip to content

Commit 79816d4

Browse files
wusamuel6rafaeljw
authored andcommitted
Revert "PM: sleep: Make pm_wakeup_clear() call more clear"
This reverts commit 56a232d. 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 <saravanak@google.com> Signed-off-by: Samuel Wu <wusamuel@google.com> [ rjw: Changelog edits ] Link: https://patch.msgid.link/20251022222830.634086-1-wusamuel@google.com Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 211ddde commit 79816d4

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

kernel/power/process.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ int freeze_processes(void)
132132
if (!pm_freezing)
133133
static_branch_inc(&freezer_active);
134134

135+
pm_wakeup_clear(0);
135136
pm_freezing = true;
136137
error = try_to_freeze_tasks(true);
137138
if (!error)

kernel/power/suspend.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,6 @@ static int enter_state(suspend_state_t state)
595595
}
596596

597597
pm_pr_dbg("Preparing system for sleep (%s)\n", mem_sleep_labels[state]);
598-
pm_wakeup_clear(0);
599598
pm_suspend_clear_flags();
600599
error = suspend_prepare(state);
601600
if (error)

0 commit comments

Comments
 (0)