diff options
-rw-r--r-- | include/linux/sysctl.h | 4 | ||||
-rw-r--r-- | kernel/sysctl_binary.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 1e4743ee6831..82c32b89932d 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h | |||
@@ -996,10 +996,6 @@ extern int proc_doulongvec_minmax(struct ctl_table *, int, | |||
996 | extern int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int, | 996 | extern int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int, |
997 | void __user *, size_t *, loff_t *); | 997 | void __user *, size_t *, loff_t *); |
998 | 998 | ||
999 | extern int do_sysctl (int __user *name, int nlen, | ||
1000 | void __user *oldval, size_t __user *oldlenp, | ||
1001 | void __user *newval, size_t newlen); | ||
1002 | |||
1003 | extern ctl_handler sysctl_data; | 999 | extern ctl_handler sysctl_data; |
1004 | extern ctl_handler sysctl_string; | 1000 | extern ctl_handler sysctl_string; |
1005 | extern ctl_handler sysctl_intvec; | 1001 | extern ctl_handler sysctl_intvec; |
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c index 775cc49da622..642019894299 100644 --- a/kernel/sysctl_binary.c +++ b/kernel/sysctl_binary.c | |||
@@ -135,7 +135,7 @@ static void deprecated_sysctl_warning(const int *name, int nlen) | |||
135 | return; | 135 | return; |
136 | } | 136 | } |
137 | 137 | ||
138 | int do_sysctl(int __user *args_name, int nlen, | 138 | static int do_sysctl(int __user *args_name, int nlen, |
139 | void __user *oldval, size_t __user *oldlenp, | 139 | void __user *oldval, size_t __user *oldlenp, |
140 | void __user *newval, size_t newlen) | 140 | void __user *newval, size_t newlen) |
141 | { | 141 | { |