PM: suspend: Drop a misplaced pm_restore_gfp_mask() call
Subsystems (2)
Rafael J. Wysocki
maintainerPATCH 1/1 PM: suspend: Drop a misplaced pm_restore_gfp_mask() call
From: Rafael J. Wysocki <[email protected]>
The pm_restore_gfp_mask() call added by commit 12ffc3b1513e ("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, it is not even necessary because dpm_resume_end() called subsequently in the same code path invokes that function again.
Drop the misplaced pm_restore_gfp_mask() call from suspend_devices_and_enter() to address this issue.
--- kernel/power/suspend.c | 1 - 1 file changed, 1 deletion(-)
kernel/power/suspend.c +0 -1
@@ -540,7 +540,6 @@return error; Recover_platform: -pm_restore_gfp_mask ();platform_recover (state); goto Resume_devices; }
Quoted 25 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
The
pm_restore_gfp_mask()call added by commit12ffc3b1513e("PM:
Restrict swap use to later in the suspend sequence") tosuspend_devices_and_enter()is done too early because it takes place before callingdpm_resume()indpm_resume_end()and some swap-backing devices may not be ready at that point. Moreover, it is not even necessary becausedpm_resume_end()called subsequently in the same code path invokes that function again.Drop the misplaced
pm_restore_gfp_mask()call fromsuspend_devices_and_enter()to address this issue.Fixes 12ffc3b1513e ("PM: Restrict swap use to later in the suspend sequence")Signed-off-by Rafael J. Wysocki <[email protected]>--- kernel/power/suspend.c | 1 - 1 file changed, 1 deletion(-)
kernel/power/suspend.c line 545
Quoted 7 lines
kernel/power/suspend.c +0
-1@@ -540,7 +540,6 @@return error; Recover_platform: -pm_restore_gfp_mask ();platform_recover (state); goto Resume_devices; }