diff options
Diffstat (limited to 'kernel/power/suspend.c')
| -rw-r--r-- | kernel/power/suspend.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 6f10dfc2d3e9..44cce10b582d 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c | |||
| @@ -189,6 +189,7 @@ static int suspend_enter(suspend_state_t state) | |||
| 189 | int suspend_devices_and_enter(suspend_state_t state) | 189 | int suspend_devices_and_enter(suspend_state_t state) |
| 190 | { | 190 | { |
| 191 | int error; | 191 | int error; |
| 192 | gfp_t saved_mask; | ||
| 192 | 193 | ||
| 193 | if (!suspend_ops) | 194 | if (!suspend_ops) |
| 194 | return -ENOSYS; | 195 | return -ENOSYS; |
| @@ -199,6 +200,7 @@ int suspend_devices_and_enter(suspend_state_t state) | |||
| 199 | goto Close; | 200 | goto Close; |
| 200 | } | 201 | } |
| 201 | suspend_console(); | 202 | suspend_console(); |
| 203 | saved_mask = clear_gfp_allowed_mask(GFP_IOFS); | ||
| 202 | suspend_test_start(); | 204 | suspend_test_start(); |
| 203 | error = dpm_suspend_start(PMSG_SUSPEND); | 205 | error = dpm_suspend_start(PMSG_SUSPEND); |
| 204 | if (error) { | 206 | if (error) { |
| @@ -215,6 +217,7 @@ int suspend_devices_and_enter(suspend_state_t state) | |||
| 215 | suspend_test_start(); | 217 | suspend_test_start(); |
| 216 | dpm_resume_end(PMSG_RESUME); | 218 | dpm_resume_end(PMSG_RESUME); |
| 217 | suspend_test_finish("resume devices"); | 219 | suspend_test_finish("resume devices"); |
| 220 | set_gfp_allowed_mask(saved_mask); | ||
| 218 | resume_console(); | 221 | resume_console(); |
| 219 | Close: | 222 | Close: |
| 220 | if (suspend_ops->end) | 223 | if (suspend_ops->end) |
