diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2022-05-17 17:07:31 +0200 |
|---|---|---|
| committer | Luis Chamberlain <mcgrof@kernel.org> | 2022-08-08 09:01:36 -0700 |
| commit | 7251ceb51af972603552fcea2db316ed2b9d95ba (patch) | |
| tree | a4dd7420aa4693e171054cb0719b81e63409519b /kernel/sysctl.c | |
| parent | 4e23eeebb2e57f5a28b36221aa776b5a1122dde5 (diff) | |
| download | linux-7251ceb51af972603552fcea2db316ed2b9d95ba.tar.gz linux-7251ceb51af972603552fcea2db316ed2b9d95ba.tar.bz2 linux-7251ceb51af972603552fcea2db316ed2b9d95ba.zip | |
sysctl: Merge adjacent CONFIG_TREE_RCU blocks
There are two adjacent sysctl entries protected by the same
CONFIG_TREE_RCU config symbol. Merge them into a single block to
improve readability.
Use the more common "#ifdef" form while at it.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Paul E. McKenney <paulmck@kernel.org>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index b233714a1c78..8a0e85a95138 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -2061,7 +2061,7 @@ static struct ctl_table kern_table[] = { .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_ONE, }, -#if defined(CONFIG_TREE_RCU) +#ifdef CONFIG_TREE_RCU { .procname = "panic_on_rcu_stall", .data = &sysctl_panic_on_rcu_stall, @@ -2071,8 +2071,6 @@ static struct ctl_table kern_table[] = { .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_ONE, }, -#endif -#if defined(CONFIG_TREE_RCU) { .procname = "max_rcu_stall_to_panic", .data = &sysctl_max_rcu_stall_to_panic, |