Merge branch 'pm-assorted'

* pm-assorted:
  PM / Sleep: Warn about system time after resume with pm_trace
This commit is contained in:
Rafael J. Wysocki 2013-06-29 15:03:51 +02:00
commit 867a420b22

View File

@ -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;