Merge branch 'pm-assorted'

* pm-assorted: PM / Sleep: Warn about system time after resume with pm_trace
git-mirror · Jun 29, 2013 · 867a420 · 867a420
2 parents 5c0b1b2 + 9dceefe
commit 867a420
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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;