summaryrefslogtreecommitdiff
path: root/kernel/power/process.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2022-02-17 18:40:54 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2022-02-17 18:40:54 -0300
commit859f7e45542aecaa77fde929232cbcf91b29e11d (patch)
tree5e81bbb0145bf2467e85ee8106734b4130f52ec0 /kernel/power/process.c
parent052747700e914896e8c78ff019411487dc7c12a0 (diff)
parentb3d971ec25346d6890e9e8f05b63f758cfcef8c5 (diff)
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes from perf/urgent that recently got merged. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'kernel/power/process.c')
-rw-r--r--kernel/power/process.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/process.c b/kernel/power/process.c
index b7e7798637b8..11b570fcf049 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -134,7 +134,7 @@ int freeze_processes(void)
if (!pm_freezing)
atomic_inc(&system_freezing_cnt);
- pm_wakeup_clear(true);
+ pm_wakeup_clear(0);
pr_info("Freezing user space processes ... ");
pm_freezing = true;
error = try_to_freeze_tasks(true);