From: Paul E. McKenney Date: Thu, 13 Nov 2014 18:39:04 +0000 (-0800) Subject: Merge branches 'torture.2014.11.03a', 'cpu.2014.11.03a', 'doc.2014.11.13a', 'fixes... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9ea6c5885681e3d9ce9844ba9dc57371a5cfc6d2;p=linux-beck.git Merge branches 'torture.2014.11.03a', 'cpu.2014.11.03a', 'doc.2014.11.13a', 'fixes.2014.11.13a', 'signal.2014.10.29a' and 'rt.2014.10.29a' into HEAD 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. --- 9ea6c5885681e3d9ce9844ba9dc57371a5cfc6d2 diff --cc kernel/rcu/tree.h index bbdc45d8d74f,36c30390e4e9,bbdc45d8d74f,bbdc45d8d74f,bbdc45d8d74f,66cde5109c7d..8e7b1843896e --- a/kernel/rcu/tree.h +++ b/kernel/rcu/tree.h @@@@@@@ -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); diff --cc lib/Kconfig.debug index 4e35a5d767ed,4e35a5d767ed,4e35a5d767ed,04e54cd3e948,4e35a5d767ed,12e7b020539f..d780351835e9 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@@@@@@ -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 diff --cc tools/testing/selftests/rcutorture/configs/rcu/TREE03 index f4567fb3e332,f4567fb3e332,f4567fb3e332,a2a9a9bcd1cd,f4567fb3e332,a022f0332303..53f24e0a0ab6 --- a/tools/testing/selftests/rcutorture/configs/rcu/TREE03 +++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE03 @@@@@@@ -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 diff --cc tools/testing/selftests/rcutorture/configs/rcu/TREE08 index 80f79d465009,69a2e255bf98,69a2e255bf98,316aa6cedce5,69a2e255bf98,6f8609d2d072..5812027d6f9f --- a/tools/testing/selftests/rcutorture/configs/rcu/TREE08 +++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE08 @@@@@@@ -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 diff --cc tools/testing/selftests/rcutorture/doc/TREE_RCU-kconfig.txt index 3e588db86a17,3e588db86a17,3e588db86a17,0dcde4c70945,3e588db86a17,f613755a90bd..ec03c883db00 --- a/tools/testing/selftests/rcutorture/doc/TREE_RCU-kconfig.txt +++ b/tools/testing/selftests/rcutorture/doc/TREE_RCU-kconfig.txt @@@@@@@ -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.