Merge branches 'torture.2014.11.03a', 'cpu.2014.11.03a', 'doc.2014.11.13a', 'fixes...
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Thu, 13 Nov 2014 18:39:04 +0000 (10:39 -0800)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Thu, 13 Nov 2014 18:39:04 +0000 (10:39 -0800)
cpu.2014.11.03a: Changes for per-CPU variables.
doc.2014.11.13a: Documentation updates.
fixes.2014.11.13a: Miscellaneous fixes.
signal.2014.10.29a: Signal changes.
rt.2014.10.29a: Real-time changes.
torture.2014.11.03a: torture-test changes.

17 files changed:
1  2  3  4  5  6 
Documentation/RCU/stallwarn.txt
Documentation/kernel-parameters.txt
include/linux/rcupdate.h
kernel/rcu/tiny.c
kernel/rcu/tree.c
kernel/rcu/tree.h
kernel/rcu/tree_plugin.h
kernel/rcu/update.c
lib/Kconfig.debug
tools/testing/selftests/rcutorture/configs/rcu/TREE01
tools/testing/selftests/rcutorture/configs/rcu/TREE02
tools/testing/selftests/rcutorture/configs/rcu/TREE02-T
tools/testing/selftests/rcutorture/configs/rcu/TREE03
tools/testing/selftests/rcutorture/configs/rcu/TREE08
tools/testing/selftests/rcutorture/configs/rcu/TREE08-T
tools/testing/selftests/rcutorture/configs/rcu/TREE09
tools/testing/selftests/rcutorture/doc/TREE_RCU-kconfig.txt

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index bbdc45d8d74f46a8812cc79cec72ca34cff835d3,36c30390e4e914597a05db0d28af48a775c2a8bc,bbdc45d8d74f46a8812cc79cec72ca34cff835d3,bbdc45d8d74f46a8812cc79cec72ca34cff835d3,bbdc45d8d74f46a8812cc79cec72ca34cff835d3,66cde5109c7dc264fd3da2bf8ec306a2733babd6..8e7b1843896ebcc0fe13ed51da7cea68f14f0a36
@@@@@@@ -561,12 -561,12 -561,12 -561,12 -561,12 -561,12 +561,12 @@@@@@@ static int rcu_preempt_offline_tasks(st
                                     struct rcu_node *rnp,
                                     struct rcu_data *rdp);
      #endif /* #ifdef CONFIG_HOTPLUG_CPU */
- ----static void rcu_preempt_check_callbacks(int cpu);
+ ++++static void rcu_preempt_check_callbacks(void);
      void call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu));
----- #if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_TREE_PREEMPT_RCU)
+++++ #if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_PREEMPT_RCU)
      static void rcu_report_exp_rnp(struct rcu_state *rsp, struct rcu_node *rnp,
                               bool wake);
----- #endif /* #if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_TREE_PREEMPT_RCU) */
+++++ #endif /* #if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_PREEMPT_RCU) */
      static void __init __rcu_init_preempt(void);
      static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags);
      static void rcu_preempt_boost_start_gp(struct rcu_node *rnp);
Simple merge
Simple merge
index 4e35a5d767ed2f50c69df7dbdbcf0e3d9885777f,4e35a5d767ed2f50c69df7dbdbcf0e3d9885777f,4e35a5d767ed2f50c69df7dbdbcf0e3d9885777f,04e54cd3e94816fdc274ed0ed9b2e7cb055e7623,4e35a5d767ed2f50c69df7dbdbcf0e3d9885777f,12e7b020539fb6d82d3e9300b2bd8ce78d5541a8..d780351835e9cb9e0b9bcf26f0e85f43d11f15c4
@@@@@@@ -1238,21 -1238,21 -1238,21 -1238,9 -1238,21 -1238,21 +1238,9 @@@@@@@ config RCU_CPU_STALL_TIMEOU
          RCU grace period persists, additional CPU stall warnings are
          printed at more widely spaced intervals.
      
--- --config RCU_CPU_STALL_VERBOSE
--- --  bool "Print additional per-task information for RCU_CPU_STALL_DETECTOR"
--- --  depends on TREE_PREEMPT_RCU
--- --  default y
--- --  help
--- --    This option causes RCU to printk detailed per-task information
--- --    for any tasks that are stalling the current RCU grace period.
--- --
--- --    Say N if you are unsure.
--- --
--- --    Say Y if you want to enable such checks.
--- --
      config RCU_CPU_STALL_INFO
        bool "Print additional diagnostics on RCU CPU stall"
-----   depends on (TREE_RCU || TREE_PREEMPT_RCU) && DEBUG_KERNEL
+++++   depends on (TREE_RCU || PREEMPT_RCU) && DEBUG_KERNEL
        default n
        help
          For each stalled CPU that is aware of the current RCU grace
index f4567fb3e3325ce967f5731cfbde164151f3d368,f4567fb3e3325ce967f5731cfbde164151f3d368,f4567fb3e3325ce967f5731cfbde164151f3d368,a2a9a9bcd1cd4f21b0c3f7e9eed7fbc1f1b3164e,f4567fb3e3325ce967f5731cfbde164151f3d368,a022f0332303ea782ebdd644fae53c2998e4eb1c..53f24e0a0ab618c8470e1727ecec0a8d78ce5db3
@@@@@@@ -15,7 -15,7 -15,7 -15,6 -15,7 -15,7 +15,6 @@@@@@@ CONFIG_RCU_FANOUT_EXACT=
      CONFIG_RCU_NOCB_CPU=n
      CONFIG_DEBUG_LOCK_ALLOC=n
      CONFIG_RCU_CPU_STALL_INFO=n
--- --CONFIG_RCU_CPU_STALL_VERBOSE=n
      CONFIG_RCU_BOOST=y
----- CONFIG_RCU_BOOST_PRIO=2
+++++ CONFIG_RCU_KTHREAD_PRIO=2
      CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
index 80f79d4650098ed679e0305b2ce43bc956112d6d,69a2e255bf984527d60faa2d8e425c642ee8fa81,69a2e255bf984527d60faa2d8e425c642ee8fa81,316aa6cedce53fa5925e4c6a0d0cf64410c8cb4d,69a2e255bf984527d60faa2d8e425c642ee8fa81,6f8609d2d072b6f05a59a517ab86d83dd3de2ef6..5812027d6f9ff043fecdcb2558a0c4befe83b50c
@@@@@@@ -18,9 -18,7 -18,7 -18,6 -18,7 -18,7 +18,8 @@@@@@@ CONFIG_RCU_FANOUT_LEAF=
      CONFIG_RCU_NOCB_CPU=y
      CONFIG_RCU_NOCB_CPU_ALL=y
      CONFIG_DEBUG_LOCK_ALLOC=n
 +++++CONFIG_PROVE_LOCKING=y
 +++++CONFIG_PROVE_RCU=y
      CONFIG_RCU_CPU_STALL_INFO=n
--- --CONFIG_RCU_CPU_STALL_VERBOSE=n
      CONFIG_RCU_BOOST=n
      CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
index 3e588db86a17c23cb952419753ed0cde5daa6d04,3e588db86a17c23cb952419753ed0cde5daa6d04,3e588db86a17c23cb952419753ed0cde5daa6d04,0dcde4c70945419ba9f3c4a751d8eaba6cc14b40,3e588db86a17c23cb952419753ed0cde5daa6d04,f613755a90bded90c9c700020275eb290cd6f934..ec03c883db005192c3d5c644ff2595f3e3c6f673
@@@@@@@ -14,10 -14,10 -14,10 -14,9 -14,10 -14,10 +14,9 @@@@@@@ CONFIG_NO_HZ_FULL_SYSIDLE -- Do one
      CONFIG_PREEMPT -- Do half.  (First three and #8.)
      CONFIG_PROVE_LOCKING -- Do all but two, covering CONFIG_PROVE_RCU and not.
      CONFIG_PROVE_RCU -- Do all but one under CONFIG_PROVE_LOCKING.
----- CONFIG_RCU_BOOST -- one of TREE_PREEMPT_RCU.
----- CONFIG_RCU_BOOST_PRIO -- set to 2 for _BOOST testing.
--- - CONFIG_RCU_CPU_STALL_INFO -- do one with and without _VERBOSE.
--- - CONFIG_RCU_CPU_STALL_VERBOSE -- do one with and without _INFO.
+++++ CONFIG_RCU_BOOST -- one of PREEMPT_RCU.
+++++ CONFIG_RCU_KTHREAD_PRIO -- set to 2 for _BOOST testing.
+++ + CONFIG_RCU_CPU_STALL_INFO -- Do one.
     -CONFIG_RCU_CPU_STALL_VERBOSE -- do one with and without _INFO.
      CONFIG_RCU_FANOUT -- Cover hierarchy as currently, but overlap with others.
      CONFIG_RCU_FANOUT_EXACT -- Do one.
      CONFIG_RCU_FANOUT_LEAF -- Do one non-default.