X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=kernel%2Fworkqueue.c;h=09b685daee3d8c18e2004a2333583e1c7e00f706;hb=1f04a73e2c6368bac8f9e0ac3ada58e6b41163f0;hp=345bec95e7080032c9de52b38faeb2669462cbe3;hpb=789cbbeca4eb7141cbd748ee93772471101b507b;p=firefly-linux-kernel-4.4.55.git

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);