summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-29 15:03:51 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-29 15:03:51 +0200
commit867a420b222b25e9608f4430bea3af50835b56b5 (patch)
treed251c69f5a29721e6d4966ccd0d0cb45f9114b30 /kernel/power
parent5c0b1b2003362c9015ee3324816c0966efaa0f88 (diff)
parent9dceefe483d7640ba0bbf3e53d1db880e7469aba (diff)
downloadlinux-867a420b222b25e9608f4430bea3af50835b56b5.tar.bz2
Merge branch 'pm-assorted'
* pm-assorted: PM / Sleep: Warn about system time after resume with pm_trace
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 0828070d38b4..1d1bf630e6e9 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -530,6 +530,10 @@ pm_trace_store(struct kobject *kobj, struct kobj_attribute *attr,
if (sscanf(buf, "%d", &val) == 1) {
pm_trace_enabled = !!val;
+ if (pm_trace_enabled) {
+ pr_warn("PM: Enabling pm_trace changes system date and time during resume.\n"
+ "PM: Correct system time has to be restored manually after resume.\n");
+ }
return n;
}
return -EINVAL;