|
@@ -560,7 +560,7 @@ static int enter_state(suspend_state_t state)
|
|
trace_suspend_resume(TPS("sync_filesystems"), 0, false);
|
|
trace_suspend_resume(TPS("sync_filesystems"), 0, false);
|
|
#endif
|
|
#endif
|
|
|
|
|
|
- pm_pr_dbg("Preparing system for sleep (%s)\n", pm_states[state]);
|
|
|
|
|
|
+ pm_pr_dbg("Preparing system for sleep (%s)\n", mem_sleep_labels[state]);
|
|
pm_suspend_clear_flags();
|
|
pm_suspend_clear_flags();
|
|
error = suspend_prepare(state);
|
|
error = suspend_prepare(state);
|
|
if (error)
|
|
if (error)
|
|
@@ -570,7 +570,7 @@ static int enter_state(suspend_state_t state)
|
|
goto Finish;
|
|
goto Finish;
|
|
|
|
|
|
trace_suspend_resume(TPS("suspend_enter"), state, false);
|
|
trace_suspend_resume(TPS("suspend_enter"), state, false);
|
|
- pm_pr_dbg("Suspending system (%s)\n", pm_states[state]);
|
|
|
|
|
|
+ pm_pr_dbg("Suspending system (%s)\n", mem_sleep_labels[state]);
|
|
pm_restrict_gfp_mask();
|
|
pm_restrict_gfp_mask();
|
|
error = suspend_devices_and_enter(state);
|
|
error = suspend_devices_and_enter(state);
|
|
pm_restore_gfp_mask();
|
|
pm_restore_gfp_mask();
|
|
@@ -597,7 +597,7 @@ int pm_suspend(suspend_state_t state)
|
|
if (state <= PM_SUSPEND_ON || state >= PM_SUSPEND_MAX)
|
|
if (state <= PM_SUSPEND_ON || state >= PM_SUSPEND_MAX)
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
- pr_info("PM: suspend entry (%s)\n", pm_states[state]);
|
|
|
|
|
|
+ pr_info("PM: suspend entry (%s)\n", mem_sleep_labels[state]);
|
|
error = enter_state(state);
|
|
error = enter_state(state);
|
|
if (error) {
|
|
if (error) {
|
|
suspend_stats.fail++;
|
|
suspend_stats.fail++;
|