mirror of
https://github.com/torvalds/linux.git
synced 2026-05-30 10:04:04 +02:00
PM: suspend: Drop a misplaced pm_restore_gfp_mask() call
The pm_restore_gfp_mask() call added by commit12ffc3b151("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:12ffc3b151("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>
This commit is contained in:
parent
347e9f5043
commit
75b63ce2c9
|
|
@ -540,7 +540,6 @@ int suspend_devices_and_enter(suspend_state_t state)
|
|||
return error;
|
||||
|
||||
Recover_platform:
|
||||
pm_restore_gfp_mask();
|
||||
platform_recover(state);
|
||||
goto Resume_devices;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user