aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung@gmail.com>2010-08-22 10:19:42 -0400
committerTejun Heo <tj@kernel.org>2010-08-23 05:37:49 -0400
commit06bd6ebffae36d3b105677598c48e8bd0a10b205 (patch)
treed75a38a50378a3365bf57383297e0fe0372e916a
parent8d9df9f0844ed87541453a3ef91bfc9f487053b7 (diff)
workqueue: annotate lock context change
Some of internal functions called within gcwq->lock context releases and regrabs the lock but were missing proper annotations. Add it. Signed-off-by: Namhyung Kim <namhyung@gmail.com> Signed-off-by: Tejun Heo <tj@kernel.org>
-rw-r--r--kernel/workqueue.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 1001b6e3fcbd..7415f27a8aa7 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -1485,6 +1485,8 @@ static void gcwq_mayday_timeout(unsigned long __gcwq)
1485 * otherwise. 1485 * otherwise.
1486 */ 1486 */
1487static bool maybe_create_worker(struct global_cwq *gcwq) 1487static bool maybe_create_worker(struct global_cwq *gcwq)
1488__releases(&gcwq->lock)
1489__acquires(&gcwq->lock)
1488{ 1490{
1489 if (!need_to_create_worker(gcwq)) 1491 if (!need_to_create_worker(gcwq))
1490 return false; 1492 return false;
@@ -1722,6 +1724,8 @@ static void cwq_dec_nr_in_flight(struct cpu_workqueue_struct *cwq, int color)
1722 * spin_lock_irq(gcwq->lock) which is released and regrabbed. 1724 * spin_lock_irq(gcwq->lock) which is released and regrabbed.
1723 */ 1725 */
1724static void process_one_work(struct worker *worker, struct work_struct *work) 1726static void process_one_work(struct worker *worker, struct work_struct *work)
1727__releases(&gcwq->lock)
1728__acquires(&gcwq->lock)
1725{ 1729{
1726 struct cpu_workqueue_struct *cwq = get_work_cwq(work); 1730 struct cpu_workqueue_struct *cwq = get_work_cwq(work);
1727 struct global_cwq *gcwq = cwq->gcwq; 1731 struct global_cwq *gcwq = cwq->gcwq;
@@ -3230,6 +3234,8 @@ static int __cpuinit trustee_thread(void *__gcwq)
3230 * multiple times. To be used by cpu_callback. 3234 * multiple times. To be used by cpu_callback.
3231 */ 3235 */
3232static void __cpuinit wait_trustee_state(struct global_cwq *gcwq, int state) 3236static void __cpuinit wait_trustee_state(struct global_cwq *gcwq, int state)
3237__releases(&gcwq->lock)
3238__acquires(&gcwq->lock)
3233{ 3239{
3234 if (!(gcwq->trustee_state == state || 3240 if (!(gcwq->trustee_state == state ||
3235 gcwq->trustee_state == TRUSTEE_DONE)) { 3241 gcwq->trustee_state == TRUSTEE_DONE)) {