Commit 7251ceb5 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Luis Chamberlain
Browse files

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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent 4e23eeeb

kernel/sysctl.c

+1 −3
Original line number Diff line number Diff line
@@ -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,