diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-05-10 15:09:53 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-05-11 15:10:14 -0400 |
commit | 87186475a402391a1ca7d42a675c9b35a18dc348 (patch) | |
tree | 01b52ab26eb3b4fed09ca7fb11da4fcc1dddb32a /kernel/power | |
parent | 54b333529df25b21da462c7dcc16c7dc779d9f26 (diff) |
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 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>
Cc: stable@kernel.org
Diffstat (limited to 'kernel/power')
-rw-r--r-- | kernel/power/suspend.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 8935369d503a..6275970b2189 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c | |||
@@ -216,7 +216,6 @@ int suspend_devices_and_enter(suspend_state_t state) | |||
216 | goto Close; | 216 | goto Close; |
217 | } | 217 | } |
218 | suspend_console(); | 218 | suspend_console(); |
219 | pm_restrict_gfp_mask(); | ||
220 | suspend_test_start(); | 219 | suspend_test_start(); |
221 | error = dpm_suspend_start(PMSG_SUSPEND); | 220 | error = dpm_suspend_start(PMSG_SUSPEND); |
222 | if (error) { | 221 | if (error) { |
@@ -233,7 +232,6 @@ int suspend_devices_and_enter(suspend_state_t state) | |||
233 | suspend_test_start(); | 232 | suspend_test_start(); |
234 | dpm_resume_end(PMSG_RESUME); | 233 | dpm_resume_end(PMSG_RESUME); |
235 | suspend_test_finish("resume devices"); | 234 | suspend_test_finish("resume devices"); |
236 | pm_restore_gfp_mask(); | ||
237 | resume_console(); | 235 | resume_console(); |
238 | Close: | 236 | Close: |
239 | if (suspend_ops->end) | 237 | if (suspend_ops->end) |
@@ -294,7 +292,9 @@ int enter_state(suspend_state_t state) | |||
294 | goto Finish; | 292 | goto Finish; |
295 | 293 | ||
296 | pr_debug("PM: Entering %s sleep\n", pm_states[state]); | 294 | pr_debug("PM: Entering %s sleep\n", pm_states[state]); |
295 | pm_restrict_gfp_mask(); | ||
297 | error = suspend_devices_and_enter(state); | 296 | error = suspend_devices_and_enter(state); |
297 | pm_restore_gfp_mask(); | ||
298 | 298 | ||
299 | Finish: | 299 | Finish: |
300 | pr_debug("PM: Finishing wakeup.\n"); | 300 | pr_debug("PM: Finishing wakeup.\n"); |