diff options
| author |   Lai Jiangshan <laijs@linux.alibaba.com> | 2019-10-15 02:55:57 +0000 |
|---|---|---|
| committer |   Paul E. McKenney <paulmck@kernel.org> | 2019-12-09 12:37:51 -0800 |
| commit | b3e627d3d5092a87fc9b9e37e341610cfecfbfdc (patch) | |
| tree | cfd14a3d775bbd4fa72d055d676b8b90b953f26d /kernel/sysctl.c | |
| parent | rcu: Use lockdep rather than comment to enforce lock held (diff) | |
| download | linux-dev-b3e627d3d5092a87fc9b9e37e341610cfecfbfdc.tar.xz linux-dev-b3e627d3d5092a87fc9b9e37e341610cfecfbfdc.zip | |
rcu: Make PREEMPT_RCU be a modifier to TREE_RCU
Currently PREEMPT_RCU and TREE_RCU are mutually exclusive Kconfig
options. But PREEMPT_RCU actually specifies a kind of TREE_RCU,
namely a preemptible TREE_RCU. This commit therefore makes PREEMPT_RCU
be a modifer to the TREE_RCU Kconfig option. This has the benefit of
simplifying several of the #if expressions that formerly needed to
check both, but now need only check one or the other.
Signed-off-by: Lai Jiangshan <laijs@linux.alibaba.com>
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
Reviewed-by: Joel Fernandes (Google) <joel@joelfernandes.org>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 70665934d53e..d396aaaf19a3 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1268,7 +1268,7 @@ static struct ctl_table kern_table[] = { .proc_handler = proc_do_static_key, }, #endif -#if defined(CONFIG_TREE_RCU) || defined(CONFIG_PREEMPT_RCU) +#if defined(CONFIG_TREE_RCU) { .procname = "panic_on_rcu_stall", .data = &sysctl_panic_on_rcu_stall, |