Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1693674

[PATCH 1/2] PM / suspend: Use mem_sleep_labels[] strings in messages

Show all headers | View raw

From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Some messages in suspend.c currently print state names from
pm_states[], but that may be confusing if the mem_sleep sysfs
attribute is changed to anything different from "mem", because
in those cases the messages will say either "freeze" or "standby"
after writing "mem" to /sys/power/state.

To avoid the confusion, use mem_sleep_labels[] strings in those
messages instead.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
 kernel/power/suspend.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: linux-pm/kernel/power/suspend.c
===================================================================
--- linux-pm.orig/kernel/power/suspend.c
+++ linux-pm/kernel/power/suspend.c
@@ -555,7 +555,7 @@ static int enter_state(suspend_state_t s
 	trace_suspend_resume(TPS("sync_filesystems"), 0, false);
 #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();
 	error = suspend_prepare(state);
 	if (error)
@@ -565,7 +565,7 @@ static int enter_state(suspend_state_t s
 		goto Finish;
 
 	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();
 	error = suspend_devices_and_enter(state);
 	pm_restore_gfp_mask();
@@ -592,7 +592,7 @@ int pm_suspend(suspend_state_t state)
 	if (state <= PM_SUSPEND_ON || state >= PM_SUSPEND_MAX)
 		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);
 	if (error) {
 		suspend_stats.fail++;

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/2] PM / suspend: Messaging updates "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2017-07-21 15:00 +0200
  [PATCH 2/2] PM / suspend: Define pr_fmt() in suspend.c "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2017-07-21 15:00 +0200
  [PATCH 1/2] PM / suspend: Use mem_sleep_labels[] strings in messages "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2017-07-21 15:00 +0200
  Re: [PATCH 0/2] PM / suspend: Messaging updates Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-07-21 17:20 +0200
    Re: [PATCH 0/2] PM / suspend: Messaging updates "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2017-07-21 23:00 +0200

csiph-web