Skip to content

Commit 7c87335

Browse files
committed
PM: suspend: Drop a misplaced pm_restore_gfp_mask() call
JIRA: https://issues.redhat.com/browse/RHEL-109250 commit 75b63ce Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Date: Thu Jul 10 10:43:26 2025 +0200 The pm_restore_gfp_mask() call added by commit 12ffc3b ("PM: Restrict swap use to later in the suspend sequence") to suspend_devices_and_enter() is done too early because it takes place before calling dpm_resume() in dpm_resume_end() and some swap-backing devices may not be ready at that point. Moreover, dpm_resume_end() called subsequently in the same code path invokes pm_restore_gfp_mask() again and calling it twice in a row is pointless. Drop the misplaced pm_restore_gfp_mask() call from suspend_devices_and_enter() to address this issue. Fixes: 12ffc3b ("PM: Restrict swap use to later in the suspend sequence") Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Mario Limonciello <mario.limonciello@amd.com> Link: https://patch.msgid.link/2810409.mvXUDI8C0e@rjwysocki.net [ rjw: Changelog edits ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Mark Langsdorf <mlangsdo@redhat.com>
1 parent d0aa910 commit 7c87335

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

kernel/power/suspend.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,6 @@ int suspend_devices_and_enter(suspend_state_t state)
531531
return error;
532532

533533
Recover_platform:
534-
pm_restore_gfp_mask();
535534
platform_recover(state);
536535
goto Resume_devices;
537536
}

0 commit comments

Comments
 (0)