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

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

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc include/linux/rcupdate.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/rcu/rcutorture.c
Simple merge

diff --cc kernel/rcu/tiny.c
Simple merge

diff --cc kernel/rcu/tree.c
index be0d0a1,4c34062..d7a3b13
--- 1/kernel/rcu/tree.c
--- 2/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"));

diff --cc kernel/rcu/tree.h
Simple merge

diff --cc kernel/rcu/tree_plugin.h
Simple merge

diff --cc kernel/rcu/update.c
Simple merge