diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-08 17:14:17 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-08 17:14:17 -0400 |
commit | 63f9ccb89552f25fa8cac57a6796479ca7eb527d (patch) | |
tree | 6b8286f4d70ccf4f2a5b65764af7887836d02bf1 /kernel/workqueue.c | |
parent | 65c0554b73c920023cc8998802e508b798113b46 (diff) | |
parent | 307c5971c972ef2bfd541d2850b36a692c6354c9 (diff) |
Merge back earlier suspend/hibernation changes for v4.8.
Diffstat (limited to 'kernel/workqueue.c')
-rw-r--r-- | kernel/workqueue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index e1c0e996b5ae..619e80ce4a59 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c | |||
@@ -4369,8 +4369,8 @@ static void show_pwq(struct pool_workqueue *pwq) | |||
4369 | /** | 4369 | /** |
4370 | * show_workqueue_state - dump workqueue state | 4370 | * show_workqueue_state - dump workqueue state |
4371 | * | 4371 | * |
4372 | * Called from a sysrq handler and prints out all busy workqueues and | 4372 | * Called from a sysrq handler or try_to_freeze_tasks() and prints out |
4373 | * pools. | 4373 | * all busy workqueues and pools. |
4374 | */ | 4374 | */ |
4375 | void show_workqueue_state(void) | 4375 | void show_workqueue_state(void) |
4376 | { | 4376 | { |