Commit 18c4e028 authored by Joel Granados's avatar Joel Granados
Browse files

watchdog: move nmi_watchdog sysctl into .rodata 



Move nmi_watchdog into the watchdog_sysctls array to prevent it from
unnecessary modification. This move effectively moves it inside the
.rodata section.

Initially moved out into its own non-const array in commit 9ec272c5
("watchdog/hardlockup: keep kernel.nmi_watchdog sysctl as 0444 if probe
fails"), which made it writable only when watchdog_hardlockup_available
was true. Moving it back to watchdog_sysctl keeps this behavior as
writing to nmi_watchdog still fails when watchdog_hardlockup_available
is false.

Reviewed-by: default avatarPetr Mladek <pmladek@suse.com>
Signed-off-by: default avatarJoel Granados <joel.granados@kernel.org>
parent 3a866087

kernel/watchdog.c

+1 −8
Original line number Diff line number Diff line
@@ -1231,14 +1231,11 @@ static const struct ctl_table watchdog_sysctls[] = { 
	},

#endif /* CONFIG_SMP */

#endif

};



static struct ctl_table watchdog_hardlockup_sysctl[] = {

	{

		.procname       = "nmi_watchdog",

		.data		= &watchdog_hardlockup_user_enabled,

		.maxlen		= sizeof(int),

		.mode		= 0444,

		.mode		= 0644,

		.proc_handler   = proc_nmi_watchdog,

		.extra1		= SYSCTL_ZERO,

		.extra2		= SYSCTL_ONE,
@@ -1248,10 +1245,6 @@ static struct ctl_table watchdog_hardlockup_sysctl[] = { 
static void __init watchdog_sysctl_init(void)

{

	register_sysctl_init("kernel", watchdog_sysctls);



	if (watchdog_hardlockup_available)

		watchdog_hardlockup_sysctl[0].mode = 0644;

	register_sysctl_init("kernel", watchdog_hardlockup_sysctl);

}



#else