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().

Joe Lawrence committed 12 years ago

Commit 3e28e371 parent 789cbbe1 file · +1 −2Browse files

Showing the changes to kernel/workqueue.c (1 of 1 file). Show all

Unified · Split

kernel/workqueue.c+1−2

@@ -2046,8 +2046,7 @@ __acquires(&pool->lock) · 2045 unmodified lines
2046	2046	* stop_machine. At the same time, report a quiescent RCU state so
2047	2047	* the same condition doesn't freeze RCU.
2048	2048	*/
2049		− rcu_note_voluntary_context_switch(current);
2050		− cond_resched();
	2049	+ cond_resched_rcu_qs();
2051	2050
2052	2051	spin_lock_irq(&pool->lock);
2053	2052