From: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Date: Tue, 16 Sep 2014 17:10:44 +0000 (-0700)
Subject: Merge branch 'rcu-tasks.2014.09.10a' into HEAD
X-Git-Tag: v3.18-rc1~74^2~1^2~15
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=96b4672703ed4538c7fc25de36df4415a0ee237c;p=linux.git

Merge branch 'rcu-tasks.2014.09.10a' into HEAD

rcu-tasks.2014.09.10a: Add RCU-tasks flavor of RCU.
---

96b4672703ed4538c7fc25de36df4415a0ee237c
diff --cc kernel/rcu/tree.c
index be0d0a1b7129,4c340625ffd4..d7a3b13bc94c
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@@ -1795,8 -1789,8 +1799,8 @@@ static int __noreturn rcu_gp_kthread(vo
  			/* Locking provides needed memory barrier. */
  			if (rcu_gp_init(rsp))
  				break;
- 			cond_resched();
+ 			cond_resched_rcu_qs();
 -			flush_signals(current);
 +			WARN_ON(signal_pending(current));
  			trace_rcu_grace_period(rsp->name,
  					       ACCESS_ONCE(rsp->gpnum),
  					       TPS("reqwaitsig"));
@@@ -1838,11 -1832,11 +1842,11 @@@
  				trace_rcu_grace_period(rsp->name,
  						       ACCESS_ONCE(rsp->gpnum),
  						       TPS("fqsend"));
- 				cond_resched();
+ 				cond_resched_rcu_qs();
  			} else {
  				/* Deal with stray signal. */
- 				cond_resched();
+ 				cond_resched_rcu_qs();
 -				flush_signals(current);
 +				WARN_ON(signal_pending(current));
  				trace_rcu_grace_period(rsp->name,
  						       ACCESS_ONCE(rsp->gpnum),
  						       TPS("fqswaitsig"));