diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 13:51:10 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 13:51:10 -0400 |
| commit | 5dd9da17eaad5b4ebcf3d3e8fd5473feb7f50090 (patch) | |
| tree | 2541f106c6cb096c264067a56cefd3af31e60f67 | |
| parent | 6f3b79fb1084e9c90b3c7582d0ad0ae0b5fee42d (diff) | |
| download | longterm-queue-4.12-5dd9da17eaad5b4ebcf3d3e8fd5473feb7f50090.tar.gz | |
pm: trivial ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/PM-s2idle-Clear-the-events_check_enabled-flag.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/queue/PM-s2idle-Clear-the-events_check_enabled-flag.patch b/queue/PM-s2idle-Clear-the-events_check_enabled-flag.patch index e987f84..51ea53f 100644 --- a/queue/PM-s2idle-Clear-the-events_check_enabled-flag.patch +++ b/queue/PM-s2idle-Clear-the-events_check_enabled-flag.patch @@ -1,4 +1,4 @@ -From 95b982b45122c57da2ee0b46cce70775e1d987af Mon Sep 17 00:00:00 2001 +From af59e675206a429ff19eaab01eb55a07a042f025 Mon Sep 17 00:00:00 2001 From: Rajat Jain <rajatja@google.com> Date: Tue, 31 Oct 2017 14:44:24 -0700 Subject: [PATCH] PM / s2idle: Clear the events_check_enabled flag @@ -36,12 +36,13 @@ so that it is always cleared for the corner cases mentioned above. Signed-off-by: Rajat Jain <rajatja@google.com> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c -index ccd2d20e6b06..0685c4499431 100644 +index 15e6baef5c73..47eb28147c9e 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c -@@ -437,7 +437,6 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) +@@ -393,7 +393,6 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) error = suspend_ops->enter(state); trace_suspend_resume(TPS("machine_suspend"), state, false); @@ -49,12 +50,12 @@ index ccd2d20e6b06..0685c4499431 100644 } else if (*wakeup) { error = -EBUSY; } -@@ -582,6 +581,7 @@ static int enter_state(suspend_state_t state) +@@ -535,6 +534,7 @@ static int enter_state(suspend_state_t state) pm_restore_gfp_mask(); Finish: + events_check_enabled = false; - pm_pr_dbg("Finishing wakeup.\n"); + pr_debug("PM: Finishing wakeup.\n"); suspend_finish(); Unlock: -- |