Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87186475 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

PM: Fix warning in pm_restrict_gfp_mask() during SNAPSHOT_S2RAM ioctl 



A warning is printed by pm_restrict_gfp_mask() while the
SNAPSHOT_S2RAM ioctl is being executed after creating a hibernation
image, because pm_restrict_gfp_mask() has been called once already
before the image creation and suspend_devices_and_enter() calls it
once again.  This happens after commit 452aa699
(mm/pm: force GFP_NOIO during suspend/hibernation and resume).

To avoid this issue, move pm_restrict_gfp_mask() and
pm_restore_gfp_mask() from suspend_devices_and_enter() to its caller
in kernel/power/suspend.c.

Reported-by: default avatarAlexandre Felipe Muller de Souza <alexandrefm@mandriva.com.br>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Cc: stable@kernel.org
parent 54b33352

kernel/power/suspend.c

+2 −2
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ int suspend_devices_and_enter(suspend_state_t state) 
			goto Close;

	}

	suspend_console();

	pm_restrict_gfp_mask();

	suspend_test_start();

	error = dpm_suspend_start(PMSG_SUSPEND);

	if (error) {
@@ -233,7 +232,6 @@ int suspend_devices_and_enter(suspend_state_t state) 
	suspend_test_start();

	dpm_resume_end(PMSG_RESUME);

	suspend_test_finish("resume devices");

	pm_restore_gfp_mask();

	resume_console();

 Close:

	if (suspend_ops->end)
@@ -294,7 +292,9 @@ int enter_state(suspend_state_t state) 
		goto Finish;



	pr_debug("PM: Entering %s sleep\n", pm_states[state]);

	pm_restrict_gfp_mask();

	error = suspend_devices_and_enter(state);

	pm_restore_gfp_mask();



 Finish:

	pr_debug("PM: Finishing wakeup.\n");