PM: Fix warning in pm_restrict_gfp_mask() during SNAPSHOT_S2RAM ioctl
authorRafael J. Wysocki <rjw@sisk.pl>
Tue, 10 May 2011 19:09:53 +0000 (21:09 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sat, 21 May 2011 22:13:12 +0000 (15:13 -0700)
commitb869799eec5145afe463368afb679445d8e4bc3f
tree8718ad5c28760296230fcedbea632b50d9e2bcec
parent1da3e2d35573b23ae38aa0f1b096cb978ecef445
PM: Fix warning in pm_restrict_gfp_mask() during SNAPSHOT_S2RAM ioctl

commit 87186475a402391a1ca7d42a675c9b35a18dc348 upstream.

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 452aa6999e6703ffbddd7f6ea124d3
(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: Alexandre Felipe Muller de Souza <alexandrefm@mandriva.com.br>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
kernel/power/suspend.c