aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/sysctl.h4
-rw-r--r--kernel/sysctl.c11
2 files changed, 1 insertions, 14 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index c7132029af0f..6a60770984e9 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -55,7 +55,7 @@ enum
55 CTL_KERN=1, /* General kernel info and control */ 55 CTL_KERN=1, /* General kernel info and control */
56 CTL_VM=2, /* VM management */ 56 CTL_VM=2, /* VM management */
57 CTL_NET=3, /* Networking */ 57 CTL_NET=3, /* Networking */
58 CTL_PROC=4, /* Process info */ 58 /* was CTL_PROC */
59 CTL_FS=5, /* Filesystems */ 59 CTL_FS=5, /* Filesystems */
60 CTL_DEBUG=6, /* Debugging */ 60 CTL_DEBUG=6, /* Debugging */
61 CTL_DEV=7, /* Devices */ 61 CTL_DEV=7, /* Devices */
@@ -767,8 +767,6 @@ enum {
767 NET_BRIDGE_NF_FILTER_VLAN_TAGGED = 4, 767 NET_BRIDGE_NF_FILTER_VLAN_TAGGED = 4,
768}; 768};
769 769
770/* CTL_PROC names: */
771
772/* CTL_FS names: */ 770/* CTL_FS names: */
773enum 771enum
774{ 772{
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index eb8bd214e7d7..2c0e65819448 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -143,7 +143,6 @@ static struct ctl_table_header root_table_header =
143 143
144static ctl_table kern_table[]; 144static ctl_table kern_table[];
145static ctl_table vm_table[]; 145static ctl_table vm_table[];
146static ctl_table proc_table[];
147static ctl_table fs_table[]; 146static ctl_table fs_table[];
148static ctl_table debug_table[]; 147static ctl_table debug_table[];
149static ctl_table dev_table[]; 148static ctl_table dev_table[];
@@ -203,12 +202,6 @@ static ctl_table root_table[] = {
203 }, 202 },
204#endif 203#endif
205 { 204 {
206 .ctl_name = CTL_PROC,
207 .procname = "proc",
208 .mode = 0555,
209 .child = proc_table,
210 },
211 {
212 .ctl_name = CTL_FS, 205 .ctl_name = CTL_FS,
213 .procname = "fs", 206 .procname = "fs",
214 .mode = 0555, 207 .mode = 0555,
@@ -927,10 +920,6 @@ static ctl_table vm_table[] = {
927 { .ctl_name = 0 } 920 { .ctl_name = 0 }
928}; 921};
929 922
930static ctl_table proc_table[] = {
931 { .ctl_name = 0 }
932};
933
934static ctl_table fs_table[] = { 923static ctl_table fs_table[] = {
935 { 924 {
936 .ctl_name = FS_NRINODE, 925 .ctl_name = FS_NRINODE,