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>

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index b233714a1c7840b4064184abfa3a8edd8ff8c3dd..8a0e85a95138ebe7925aba96f0abc6ef6f2485e0 100644 (file)
--- 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,