Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Joel Granados <joel.granados@kernel.org>
+30
-31
+30
kernel/panic.c
+30
kernel/panic.c
···
97
97
},
98
98
#endif
99
99
{
100
+
.procname = "panic",
101
+
.data = &panic_timeout,
102
+
.maxlen = sizeof(int),
103
+
.mode = 0644,
104
+
.proc_handler = proc_dointvec,
105
+
},
106
+
{
107
+
.procname = "panic_on_oops",
108
+
.data = &panic_on_oops,
109
+
.maxlen = sizeof(int),
110
+
.mode = 0644,
111
+
.proc_handler = proc_dointvec,
112
+
},
113
+
{
114
+
.procname = "panic_print",
115
+
.data = &panic_print,
116
+
.maxlen = sizeof(unsigned long),
117
+
.mode = 0644,
118
+
.proc_handler = proc_doulongvec_minmax,
119
+
},
120
+
{
121
+
.procname = "panic_on_warn",
122
+
.data = &panic_on_warn,
123
+
.maxlen = sizeof(int),
124
+
.mode = 0644,
125
+
.proc_handler = proc_dointvec_minmax,
126
+
.extra1 = SYSCTL_ZERO,
127
+
.extra2 = SYSCTL_ONE,
128
+
},
129
+
{
100
130
.procname = "warn_limit",
101
131
.data = &warn_limit,
102
132
.maxlen = sizeof(warn_limit),
-31
kernel/sysctl.c
-31
kernel/sysctl.c
···
23
23
#include <linux/sysctl.h>
24
24
#include <linux/bitmap.h>
25
25
#include <linux/signal.h>
26
-
#include <linux/panic.h>
27
26
#include <linux/printk.h>
28
27
#include <linux/proc_fs.h>
29
28
#include <linux/security.h>
···
1587
1588
}
1588
1589
1589
1590
static const struct ctl_table kern_table[] = {
1590
-
{
1591
-
.procname = "panic",
1592
-
.data = &panic_timeout,
1593
-
.maxlen = sizeof(int),
1594
-
.mode = 0644,
1595
-
.proc_handler = proc_dointvec,
1596
-
},
1597
1591
#ifdef CONFIG_PROC_SYSCTL
1598
1592
{
1599
1593
.procname = "tainted",
···
1765
1773
.extra2 = SYSCTL_MAXOLDUID,
1766
1774
},
1767
1775
{
1768
-
.procname = "panic_on_oops",
1769
-
.data = &panic_on_oops,
1770
-
.maxlen = sizeof(int),
1771
-
.mode = 0644,
1772
-
.proc_handler = proc_dointvec,
1773
-
},
1774
-
{
1775
-
.procname = "panic_print",
1776
-
.data = &panic_print,
1777
-
.maxlen = sizeof(unsigned long),
1778
-
.mode = 0644,
1779
-
.proc_handler = proc_doulongvec_minmax,
1780
-
},
1781
-
{
1782
1776
.procname = "ngroups_max",
1783
1777
.data = (void *)&ngroups_max,
1784
1778
.maxlen = sizeof (int),
···
1815
1837
.proc_handler = proc_dointvec,
1816
1838
},
1817
1839
#endif
1818
-
{
1819
-
.procname = "panic_on_warn",
1820
-
.data = &panic_on_warn,
1821
-
.maxlen = sizeof(int),
1822
-
.mode = 0644,
1823
-
.proc_handler = proc_dointvec_minmax,
1824
-
.extra1 = SYSCTL_ZERO,
1825
-
.extra2 = SYSCTL_ONE,
1826
-
},
1827
1840
#ifdef CONFIG_TREE_RCU
1828
1841
{
1829
1842
.procname = "panic_on_rcu_stall",