diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-01-25 10:05:23 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-01-25 10:05:23 +0100 |
| commit | f8a4bb6bfa639fbdd07aede615be6dffe86a9713 (patch) | |
| tree | 158a3e44edfd02bb81addfb779ea1850114f3361 /kernel/sysctl.c | |
| parent | Merge tag 'xarray-5.5' of git://git.infradead.org/users/willy/linux-dax (diff) | |
| parent | Merge branches 'doc.2019.12.10a', 'exp.2019.12.09a', 'fixes.2020.01.24a', 'kf... (diff) | |
| download | linux-f8a4bb6bfa639fbdd07aede615be6dffe86a9713.tar.gz linux-f8a4bb6bfa639fbdd07aede615be6dffe86a9713.zip | |
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU updates from Paul E. McKenney:
- Expedited grace-period updates
- kfree_rcu() updates
- RCU list updates
- Preemptible RCU updates
- Torture-test updates
- Miscellaneous fixes
- Documentation updates
Signed-off-by: Ingo Molnar <mingo@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, |