reboot: move arch/x86 reboot= handling to generic kernel

[firefly-linux-kernel-4.4.55.git] / kernel / power / main.c

diff --git a/kernel/power/main.c b/kernel/power/main.c
index d77663bfedeb071370f584f2bf1e42cd8332e5a4..1d1bf630e6e900d5354413a6176b60b6a948a979 100644 (file)
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -424,6 +424,8 @@ static ssize_t wakeup_count_store(struct kobject *kobj,
        if (sscanf(buf, "%u", &val) == 1) {
                if (pm_save_wakeup_count(val))
                        error = n;
+               else
+                       pm_print_active_wakeup_sources();
        }
 
  out:
@@ -528,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;