Commit c09b9810 authored by Joel Granados's avatar Joel Granados
Browse files

panic: Move panic ctl tables into panic.c 



Move panic, panic_on_oops, panic_print, panic_on_warn into
kerne/panic.c. This is part of a greater effort to move ctl tables into
their respective subsystems which will reduce the merge conflicts in
kernel/sysctl.c.

Signed-off-by: default avatarJoel Granados <joel.granados@kernel.org>
parent 0af2f6be

kernel/panic.c

+30 −0
Original line number Diff line number Diff line
@@ -96,6 +96,36 @@ static const struct ctl_table kern_panic_table[] = { 
		.extra2         = SYSCTL_ONE,

	},

#endif

	{

		.procname	= "panic",

		.data		= &panic_timeout,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

	{

		.procname	= "panic_on_oops",

		.data		= &panic_on_oops,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

	{

		.procname	= "panic_print",

		.data		= &panic_print,

		.maxlen		= sizeof(unsigned long),

		.mode		= 0644,

		.proc_handler	= proc_doulongvec_minmax,

	},

	{

		.procname	= "panic_on_warn",

		.data		= &panic_on_warn,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= SYSCTL_ZERO,

		.extra2		= SYSCTL_ONE,

	},

	{

		.procname       = "warn_limit",

		.data           = &warn_limit,

kernel/sysctl.c

+0 −31
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/sysctl.h>

#include <linux/bitmap.h>

#include <linux/signal.h>

#include <linux/panic.h>

#include <linux/printk.h>

#include <linux/proc_fs.h>

#include <linux/security.h>
@@ -1588,13 +1587,6 @@ int proc_do_static_key(const struct ctl_table *table, int write, 
}



static const struct ctl_table kern_table[] = {

	{

		.procname	= "panic",

		.data		= &panic_timeout,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

#ifdef CONFIG_PROC_SYSCTL

	{

		.procname	= "tainted",
@@ -1772,20 +1764,6 @@ static const struct ctl_table kern_table[] = { 
		.extra1		= SYSCTL_ZERO,

		.extra2		= SYSCTL_MAXOLDUID,

	},

	{

		.procname	= "panic_on_oops",

		.data		= &panic_on_oops,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

	{

		.procname	= "panic_print",

		.data		= &panic_print,

		.maxlen		= sizeof(unsigned long),

		.mode		= 0644,

		.proc_handler	= proc_doulongvec_minmax,

	},

	{

		.procname	= "ngroups_max",

		.data		= (void *)&ngroups_max,
@@ -1837,15 +1815,6 @@ static const struct ctl_table kern_table[] = { 
		.proc_handler	= proc_dointvec,

	},

#endif

	{

		.procname	= "panic_on_warn",

		.data		= &panic_on_warn,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= SYSCTL_ZERO,

		.extra2		= SYSCTL_ONE,

	},

#ifdef CONFIG_TREE_RCU

	{

		.procname	= "panic_on_rcu_stall",