Merge branches 'doc.2015.01.07a', 'fixes.2015.01.15a', 'preempt.2015.01.06a', 'srcu...

doc.2015.01.07a: Documentation updates.
fixes.2015.01.15a: Miscellaneous fixes.
preempt.2015.01.06a: Changes to handling of lists of preempted tasks.
srcu.2015.01.06a: SRCU updates.
stall.2015.01.16a: RCU CPU stall-warning updates and fixes.
torture.2015.01.11a: RCU torture-test updates and fixes.

diff --cc Documentation/RCU/stallwarn.txt
Simple merge

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

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

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

diff --cc init/Kconfig
Simple merge

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

diff --cc kernel/rcu/tiny_plugin.h
index 858c5656912724c64e1ea20d5497edc9e8946b7d,b5fc5e5fc85dc4e1cf5ca4acf38e4eafe48a04a2,858c5656912724c64e1ea20d5497edc9e8946b7d,858c5656912724c64e1ea20d5497edc9e8946b7d,80f908afe348d3d5878086376ea2783de2b90ed1,858c5656912724c64e1ea20d5497edc9e8946b7d..f94e209a10d615a5a4f7d379e623918f533ce814
--- 1/kernel/rcu/tiny_plugin.h
--- 2/kernel/rcu/tiny_plugin.h
--- 3/kernel/rcu/tiny_plugin.h
--- 4/kernel/rcu/tiny_plugin.h
--- 5/kernel/rcu/tiny_plugin.h
--- 6/kernel/rcu/tiny_plugin.h
+++ b/kernel/rcu/tiny_plugin.h
@@@@@@@ -145,17 -145,17 -145,17 -145,17 -145,16 -145,17 +145,16 @@@@@@@ static void check_cpu_stall(struct rcu_
        rcp->ticks_this_gp++;
        j = jiffies;
        js = ACCESS_ONCE(rcp->jiffies_stall);
---- -  if (*rcp->curtail && ULONG_CMP_GE(j, js)) {
++++ +  if (rcp->rcucblist && ULONG_CMP_GE(j, js)) {
                pr_err("INFO: %s stall on CPU (%lu ticks this GP) idle=%llx (t=%lu jiffies q=%ld)\n",
- ----                 rcp->name, rcp->ticks_this_gp, rcu_dynticks_nesting,
+ ++++                 rcp->name, rcp->ticks_this_gp, DYNTICK_TASK_EXIT_IDLE,
                       jiffies - rcp->gp_start, rcp->qlen);
                dump_stack();
---- -  }
---- -  if (*rcp->curtail && ULONG_CMP_GE(j, js))
                ACCESS_ONCE(rcp->jiffies_stall) = jiffies +
                        3 * rcu_jiffies_till_stall_check() + 3;
---- -  else if (ULONG_CMP_GE(j, js))
++++ +  } else if (ULONG_CMP_GE(j, js)) {
                ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
++++ +  }
      }
      
      static void reset_cpu_stall_ticks(struct rcu_ctrlblk *rcp)

diff --cc kernel/rcu/tree.c
index 4c106fcc0d54a79d905edf0a6619c77fe2e369e1,5b9f3b972a79c4abe99951d2c1fdd5941b3f0201,febd0f72a3c93f6a02744b233ffbcdf2b1c40b95,4c106fcc0d54a79d905edf0a6619c77fe2e369e1,e335f33d0b9f1a7327d9ebe5bb881bb186a4ae84,c0faad51ae87d39f4dcd8a5247c0eddafc470b7f..48d640ca1a05b8c0f83fe2b217b925a6dec69fa4
--- 1/kernel/rcu/tree.c
--- 2/kernel/rcu/tree.c
--- 3/kernel/rcu/tree.c
--- 4/kernel/rcu/tree.c
--- 5/kernel/rcu/tree.c
--- 6/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@@@@@@ -315,9 -315,9 -315,9 -315,9 -338,9 -315,45 +338,45 @@@@@@@ static void force_quiescent_state(struc
      static int rcu_pending(void);
      
      /*
-----  * Return the number of RCU-sched batches processed thus far for debug & stats.
+++++  * Return the number of RCU batches started thus far for debug & stats.
+ ++   */
 -  - long rcu_batches_completed_sched(void)
+++++ unsigned long rcu_batches_started(void)
+++++ {
+++++   return rcu_state_p->gpnum;
+++++ }
+++++ EXPORT_SYMBOL_GPL(rcu_batches_started);
+++++ 
+++++ /*
+++++  * Return the number of RCU-sched batches started thus far for debug & stats.
 ++ +  */
-  -  long rcu_batches_completed_sched(void)
+++++ unsigned long rcu_batches_started_sched(void)
+++++ {
+++++   return rcu_sched_state.gpnum;
+++++ }
+++++ EXPORT_SYMBOL_GPL(rcu_batches_started_sched);
+++++ 
+++++ /*
+++++  * Return the number of RCU BH batches started thus far for debug & stats.
+++++  */
+++++ unsigned long rcu_batches_started_bh(void)
+++++ {
+++++   return rcu_bh_state.gpnum;
+++++ }
+++++ EXPORT_SYMBOL_GPL(rcu_batches_started_bh);
+++++ 
+++++ /*
+++++  * Return the number of RCU batches completed thus far for debug & stats.
+++++  */
+++++ unsigned long rcu_batches_completed(void)
+++++ {
+++++   return rcu_state_p->completed;
+++++ }
+++++ EXPORT_SYMBOL_GPL(rcu_batches_completed);
+++++ 
+++++ /*
+++++  * Return the number of RCU-sched batches completed thus far for debug & stats.
++ ++  */
  -   long rcu_batches_completed_sched(void)
+++++ unsigned long rcu_batches_completed_sched(void)
      {
        return rcu_sched_state.completed;
      }

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

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

diff --cc lib/Kconfig.debug
Simple merge