Merge branch 'pm-assorted'

* pm-assorted:
  PM / Sleep: Warn about system time after resume with pm_trace

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;