Commit f5ead5ce authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds

sysctl: remove binary sysctl support where it clearly doesn't work

These functions are all wrapper functions for the proc interface that are
needed for them to work correctly.
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Cc: Alexey Dobriyan <adobriyan@sw.ru>
Acked-by: default avatarAndrew Morgan <morgan@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 97aeacf4
...@@ -365,7 +365,6 @@ static struct ctl_table kern_table[] = { ...@@ -365,7 +365,6 @@ static struct ctl_table kern_table[] = {
}, },
#ifdef CONFIG_PROC_SYSCTL #ifdef CONFIG_PROC_SYSCTL
{ {
.ctl_name = KERN_TAINTED,
.procname = "tainted", .procname = "tainted",
.data = &tainted, .data = &tainted,
.maxlen = sizeof(int), .maxlen = sizeof(int),
...@@ -374,7 +373,6 @@ static struct ctl_table kern_table[] = { ...@@ -374,7 +373,6 @@ static struct ctl_table kern_table[] = {
}, },
#endif #endif
{ {
.ctl_name = KERN_CAP_BSET,
.procname = "cap-bound", .procname = "cap-bound",
.data = &cap_bset, .data = &cap_bset,
.maxlen = sizeof(kernel_cap_t), .maxlen = sizeof(kernel_cap_t),
...@@ -650,7 +648,6 @@ static struct ctl_table kern_table[] = { ...@@ -650,7 +648,6 @@ static struct ctl_table kern_table[] = {
.proc_handler = &proc_dointvec, .proc_handler = &proc_dointvec,
}, },
{ {
.ctl_name = KERN_NMI_WATCHDOG,
.procname = "nmi_watchdog", .procname = "nmi_watchdog",
.data = &nmi_watchdog_enabled, .data = &nmi_watchdog_enabled,
.maxlen = sizeof (int), .maxlen = sizeof (int),
...@@ -847,7 +844,6 @@ static struct ctl_table vm_table[] = { ...@@ -847,7 +844,6 @@ static struct ctl_table vm_table[] = {
.extra2 = &one_hundred, .extra2 = &one_hundred,
}, },
{ {
.ctl_name = VM_DIRTY_WB_CS,
.procname = "dirty_writeback_centisecs", .procname = "dirty_writeback_centisecs",
.data = &dirty_writeback_interval, .data = &dirty_writeback_interval,
.maxlen = sizeof(dirty_writeback_interval), .maxlen = sizeof(dirty_writeback_interval),
...@@ -855,7 +851,6 @@ static struct ctl_table vm_table[] = { ...@@ -855,7 +851,6 @@ static struct ctl_table vm_table[] = {
.proc_handler = &dirty_writeback_centisecs_handler, .proc_handler = &dirty_writeback_centisecs_handler,
}, },
{ {
.ctl_name = VM_DIRTY_EXPIRE_CS,
.procname = "dirty_expire_centisecs", .procname = "dirty_expire_centisecs",
.data = &dirty_expire_interval, .data = &dirty_expire_interval,
.maxlen = sizeof(dirty_expire_interval), .maxlen = sizeof(dirty_expire_interval),
...@@ -883,7 +878,6 @@ static struct ctl_table vm_table[] = { ...@@ -883,7 +878,6 @@ static struct ctl_table vm_table[] = {
}, },
#ifdef CONFIG_HUGETLB_PAGE #ifdef CONFIG_HUGETLB_PAGE
{ {
.ctl_name = VM_HUGETLB_PAGES,
.procname = "nr_hugepages", .procname = "nr_hugepages",
.data = &max_huge_pages, .data = &max_huge_pages,
.maxlen = sizeof(unsigned long), .maxlen = sizeof(unsigned long),
...@@ -1116,7 +1110,6 @@ static struct ctl_table fs_table[] = { ...@@ -1116,7 +1110,6 @@ static struct ctl_table fs_table[] = {
.proc_handler = &proc_dointvec, .proc_handler = &proc_dointvec,
}, },
{ {
.ctl_name = FS_NRFILE,
.procname = "file-nr", .procname = "file-nr",
.data = &files_stat, .data = &files_stat,
.maxlen = 3*sizeof(int), .maxlen = 3*sizeof(int),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment