summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-13 12:59:57 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-13 12:59:57 -0800
commitc11a6cfb0103d5d831e20bd9b75d10d13519fec5 (patch)
treef6706e6c68ad5c07922eb9a40e5bdb5f0a68581f /kernel/power
parente6efef7260ac2bb170059980a78440499f2cc0db (diff)
parent8bc4a04455969c36bf54a942ad9d28d80969ed51 (diff)
downloadlinux-c11a6cfb0103d5d831e20bd9b75d10d13519fec5.tar.gz
linux-c11a6cfb0103d5d831e20bd9b75d10d13519fec5.tar.bz2
linux-c11a6cfb0103d5d831e20bd9b75d10d13519fec5.zip
Merge branch 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue updates from Tejun Heo: "Mostly patches to initialize workqueue subsystem earlier and get rid of keventd_up(). The patches were headed for the last merge cycle but got delayed due to a bug found late minute, which is fixed now. Also, to help debugging, destroy_workqueue() is more chatty now on a sanity check failure." * 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: workqueue: move wq_numa_init() to workqueue_init() workqueue: remove keventd_up() debugobj, workqueue: remove keventd_up() usage slab, workqueue: remove keventd_up() usage power, workqueue: remove keventd_up() usage tty, workqueue: remove keventd_up() usage mce, workqueue: remove keventd_up() usage workqueue: make workqueue available early during boot workqueue: dump workqueue state on sanity check failures in destroy_workqueue()
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/qos.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/kernel/power/qos.c b/kernel/power/qos.c
index 168ff442ebde..97b0df71303e 100644
--- a/kernel/power/qos.c
+++ b/kernel/power/qos.c
@@ -482,16 +482,7 @@ void pm_qos_update_request(struct pm_qos_request *req,
return;
}
- /*
- * This function may be called very early during boot, for example,
- * from of_clk_init(), where irq needs to stay disabled.
- * cancel_delayed_work_sync() assumes that irq is enabled on
- * invocation and re-enables it on return. Avoid calling it until
- * workqueue is initialized.
- */
- if (keventd_up())
- cancel_delayed_work_sync(&req->work);
-
+ cancel_delayed_work_sync(&req->work);
__pm_qos_update_request(req, new_value);
}
EXPORT_SYMBOL_GPL(pm_qos_update_request);