summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoger Lu <roger.lu@mediatek.com>2016-07-01 11:05:02 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-07-02 01:42:48 +0200
commit7b776af66dc462caa7e839cc5c950a61db1f8551 (patch)
treea9a32ede061fe88dd885e93bcbca748427cd4a18
parentea00f4f4f00cc2bc3b63ad512a4e6df3b20832b9 (diff)
downloadlinux-stable-7b776af66dc462caa7e839cc5c950a61db1f8551.tar.gz
linux-stable-7b776af66dc462caa7e839cc5c950a61db1f8551.tar.bz2
linux-stable-7b776af66dc462caa7e839cc5c950a61db1f8551.zip
PM / suspend: show workqueue state in suspend flow
If freezable workqueue aborts suspend flow, show workqueue state for debug purpose. Signed-off-by: Roger Lu <roger.lu@mediatek.com> Acked-by: Tejun Heo <tj@kernel.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--kernel/power/process.c3
-rw-r--r--kernel/workqueue.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/kernel/power/process.c b/kernel/power/process.c
index df058bed53ce..6eef250a5705 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -89,6 +89,9 @@ static int try_to_freeze_tasks(bool user_only)
elapsed_msecs / 1000, elapsed_msecs % 1000,
todo - wq_busy, wq_busy);
+ if (wq_busy)
+ show_workqueue_state();
+
if (!wakeup) {
read_lock(&tasklist_lock);
for_each_process_thread(g, p) {
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)
/**
* show_workqueue_state - dump workqueue state
*
- * Called from a sysrq handler and prints out all busy workqueues and
- * pools.
+ * Called from a sysrq handler or try_to_freeze_tasks() and prints out
+ * all busy workqueues and pools.
*/
void show_workqueue_state(void)
{