Skip to content

Commit 75b63ce

Browse files
committed
PM: suspend: Drop a misplaced pm_restore_gfp_mask() call
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 <[email protected]> Reviewed-by: Mario Limonciello <[email protected]> Link: https://patch.msgid.link/[email protected] [ rjw: Changelog edits ] Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 347e9f5 commit 75b63ce

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
@@ -540,7 +540,6 @@ int suspend_devices_and_enter(suspend_state_t state)
540540
return error;
541541

542542
Recover_platform:
543-
pm_restore_gfp_mask();
544543
platform_recover(state);
545544
goto Resume_devices;
546545
}

0 commit comments

Comments
 (0)