diff options
| author | Joe Lawrence <joe.lawrence@stratus.com> | 2014-10-05 19:24:22 +0200 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2014-10-06 14:58:26 +0200 |
| commit | 3e28e377204badfc3c4119ff2abda473127ee0ff (patch) | |
| tree | 75653d8e0802e2e7c060f5b49277e9cd87fba8e7 /kernel/workqueue.c | |
| parent | workqueue: Add quiescent state between work items (diff) | |
| download | linux-3e28e377204badfc3c4119ff2abda473127ee0ff.tar.xz linux-3e28e377204badfc3c4119ff2abda473127ee0ff.zip | |
workqueue: Use cond_resched_rcu_qs macro
Tidy up and use cond_resched_rcu_qs when calling cond_resched and
reporting potential quiescent state to RCU. Splitting this change in
this way allows easy backporting to -stable for kernel versions not
having cond_resched_rcu_qs().
Signed-off-by: Joe Lawrence <joe.lawrence@stratus.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Diffstat (limited to 'kernel/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 345bec95e708..09b685daee3d 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -2046,8 +2046,7 @@ __acquires(&pool->lock) * stop_machine. At the same time, report a quiescent RCU state so * the same condition doesn't freeze RCU. */ - rcu_note_voluntary_context_switch(current); - cond_resched(); + cond_resched_rcu_qs(); spin_lock_irq(&pool->lock); |