aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-10-18 06:05:22 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-18 17:37:22 -0400
commitd8217f076b73441dd3869c0c880df000655084cc (patch)
tree279c6bda7b3ad8bc8cd8099681a93d59fd193f26 /kernel/sysctl.c
parentd32c4f2626acc385d5187bd5c0c24f442328dc60 (diff)
sysctl core: Stop using the unnecessary ctl_table typedef
In sysctl.h the typedef struct ctl_table ctl_table violates coding style isn't needed and is a bit of a nuisance because it makes it harder to recognize ctl_table is a type name. So this patch removes it from the generic sysctl code. Hopefully I will have enough energy to send the rest of my patches will follow and to remove it from the rest of the kernel. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Cc: Alexey Dobriyan <adobriyan@sw.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r--kernel/sysctl.c114
1 files changed, 57 insertions, 57 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index dde3d53e8adc..73c84b6e7a35 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -142,32 +142,32 @@ extern int max_lock_depth;
142 142
143#ifdef CONFIG_SYSCTL_SYSCALL 143#ifdef CONFIG_SYSCTL_SYSCALL
144static int parse_table(int __user *, int, void __user *, size_t __user *, 144static int parse_table(int __user *, int, void __user *, size_t __user *,
145 void __user *, size_t, ctl_table *); 145 void __user *, size_t, struct ctl_table *);
146#endif 146#endif
147 147
148 148
149#ifdef CONFIG_PROC_SYSCTL 149#ifdef CONFIG_PROC_SYSCTL
150static int proc_do_cad_pid(ctl_table *table, int write, struct file *filp, 150static int proc_do_cad_pid(struct ctl_table *table, int write, struct file *filp,
151 void __user *buffer, size_t *lenp, loff_t *ppos); 151 void __user *buffer, size_t *lenp, loff_t *ppos);
152static int proc_dointvec_taint(ctl_table *table, int write, struct file *filp, 152static int proc_dointvec_taint(struct ctl_table *table, int write, struct file *filp,
153 void __user *buffer, size_t *lenp, loff_t *ppos); 153 void __user *buffer, size_t *lenp, loff_t *ppos);
154#endif 154#endif
155 155
156static ctl_table root_table[]; 156static struct ctl_table root_table[];
157static struct ctl_table_header root_table_header = 157static struct ctl_table_header root_table_header =
158 { root_table, LIST_HEAD_INIT(root_table_header.ctl_entry) }; 158 { root_table, LIST_HEAD_INIT(root_table_header.ctl_entry) };
159 159
160static ctl_table kern_table[]; 160static struct ctl_table kern_table[];
161static ctl_table vm_table[]; 161static struct ctl_table vm_table[];
162static ctl_table fs_table[]; 162static struct ctl_table fs_table[];
163static ctl_table debug_table[]; 163static struct ctl_table debug_table[];
164static ctl_table dev_table[]; 164static struct ctl_table dev_table[];
165extern ctl_table random_table[]; 165extern struct ctl_table random_table[];
166#ifdef CONFIG_UNIX98_PTYS 166#ifdef CONFIG_UNIX98_PTYS
167extern ctl_table pty_table[]; 167extern struct ctl_table pty_table[];
168#endif 168#endif
169#ifdef CONFIG_INOTIFY_USER 169#ifdef CONFIG_INOTIFY_USER
170extern ctl_table inotify_table[]; 170extern struct ctl_table inotify_table[];
171#endif 171#endif
172 172
173#ifdef HAVE_ARCH_PICK_MMAP_LAYOUT 173#ifdef HAVE_ARCH_PICK_MMAP_LAYOUT
@@ -179,7 +179,7 @@ extern int lock_stat;
179 179
180/* The default sysctl tables: */ 180/* The default sysctl tables: */
181 181
182static ctl_table root_table[] = { 182static struct ctl_table root_table[] = {
183 { 183 {
184 .ctl_name = CTL_KERN, 184 .ctl_name = CTL_KERN,
185 .procname = "kernel", 185 .procname = "kernel",
@@ -232,7 +232,7 @@ static unsigned long min_wakeup_granularity_ns; /* 0 usecs */
232static unsigned long max_wakeup_granularity_ns = 1000000000; /* 1 second */ 232static unsigned long max_wakeup_granularity_ns = 1000000000; /* 1 second */
233#endif 233#endif
234 234
235static ctl_table kern_table[] = { 235static struct ctl_table kern_table[] = {
236#ifdef CONFIG_SCHED_DEBUG 236#ifdef CONFIG_SCHED_DEBUG
237 { 237 {
238 .ctl_name = CTL_UNNUMBERED, 238 .ctl_name = CTL_UNNUMBERED,
@@ -783,7 +783,7 @@ static ctl_table kern_table[] = {
783 { .ctl_name = 0 } 783 { .ctl_name = 0 }
784}; 784};
785 785
786static ctl_table vm_table[] = { 786static struct ctl_table vm_table[] = {
787 { 787 {
788 .ctl_name = VM_OVERCOMMIT_MEMORY, 788 .ctl_name = VM_OVERCOMMIT_MEMORY,
789 .procname = "overcommit_memory", 789 .procname = "overcommit_memory",
@@ -1093,12 +1093,12 @@ static ctl_table vm_table[] = {
1093}; 1093};
1094 1094
1095#if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE) 1095#if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE)
1096static ctl_table binfmt_misc_table[] = { 1096static struct ctl_table binfmt_misc_table[] = {
1097 { .ctl_name = 0 } 1097 { .ctl_name = 0 }
1098}; 1098};
1099#endif 1099#endif
1100 1100
1101static ctl_table fs_table[] = { 1101static struct ctl_table fs_table[] = {
1102 { 1102 {
1103 .ctl_name = FS_NRINODE, 1103 .ctl_name = FS_NRINODE,
1104 .procname = "inode-nr", 1104 .procname = "inode-nr",
@@ -1239,7 +1239,7 @@ static ctl_table fs_table[] = {
1239 { .ctl_name = 0 } 1239 { .ctl_name = 0 }
1240}; 1240};
1241 1241
1242static ctl_table debug_table[] = { 1242static struct ctl_table debug_table[] = {
1243#if defined(CONFIG_X86) || defined(CONFIG_PPC) 1243#if defined(CONFIG_X86) || defined(CONFIG_PPC)
1244 { 1244 {
1245 .ctl_name = CTL_UNNUMBERED, 1245 .ctl_name = CTL_UNNUMBERED,
@@ -1253,7 +1253,7 @@ static ctl_table debug_table[] = {
1253 { .ctl_name = 0 } 1253 { .ctl_name = 0 }
1254}; 1254};
1255 1255
1256static ctl_table dev_table[] = { 1256static struct ctl_table dev_table[] = {
1257 { .ctl_name = 0 } 1257 { .ctl_name = 0 }
1258}; 1258};
1259 1259
@@ -1393,7 +1393,7 @@ static int test_perm(int mode, int op)
1393 return -EACCES; 1393 return -EACCES;
1394} 1394}
1395 1395
1396int sysctl_perm(ctl_table *table, int op) 1396int sysctl_perm(struct ctl_table *table, int op)
1397{ 1397{
1398 int error; 1398 int error;
1399 error = security_sysctl(table, op); 1399 error = security_sysctl(table, op);
@@ -1406,7 +1406,7 @@ int sysctl_perm(ctl_table *table, int op)
1406static int parse_table(int __user *name, int nlen, 1406static int parse_table(int __user *name, int nlen,
1407 void __user *oldval, size_t __user *oldlenp, 1407 void __user *oldval, size_t __user *oldlenp,
1408 void __user *newval, size_t newlen, 1408 void __user *newval, size_t newlen,
1409 ctl_table *table) 1409 struct ctl_table *table)
1410{ 1410{
1411 int n; 1411 int n;
1412repeat: 1412repeat:
@@ -1437,7 +1437,7 @@ repeat:
1437} 1437}
1438 1438
1439/* Perform the actual read/write of a sysctl table entry. */ 1439/* Perform the actual read/write of a sysctl table entry. */
1440int do_sysctl_strategy (ctl_table *table, 1440int do_sysctl_strategy (struct ctl_table *table,
1441 int __user *name, int nlen, 1441 int __user *name, int nlen,
1442 void __user *oldval, size_t __user *oldlenp, 1442 void __user *oldval, size_t __user *oldlenp,
1443 void __user *newval, size_t newlen) 1443 void __user *newval, size_t newlen)
@@ -1512,7 +1512,7 @@ core_initcall(sysctl_init);
1512 * Register a sysctl table hierarchy. @table should be a filled in ctl_table 1512 * Register a sysctl table hierarchy. @table should be a filled in ctl_table
1513 * array. An entry with a ctl_name of 0 terminates the table. 1513 * array. An entry with a ctl_name of 0 terminates the table.
1514 * 1514 *
1515 * The members of the &ctl_table structure are used as follows: 1515 * The members of the &struct ctl_table structure are used as follows:
1516 * 1516 *
1517 * ctl_name - This is the numeric sysctl value used by sysctl(2). The number 1517 * ctl_name - This is the numeric sysctl value used by sysctl(2). The number
1518 * must be unique within that level of sysctl 1518 * must be unique within that level of sysctl
@@ -1573,7 +1573,7 @@ core_initcall(sysctl_init);
1573 * This routine returns %NULL on a failure to register, and a pointer 1573 * This routine returns %NULL on a failure to register, and a pointer
1574 * to the table header on success. 1574 * to the table header on success.
1575 */ 1575 */
1576struct ctl_table_header *register_sysctl_table(ctl_table * table) 1576struct ctl_table_header *register_sysctl_table(struct ctl_table * table)
1577{ 1577{
1578 struct ctl_table_header *tmp; 1578 struct ctl_table_header *tmp;
1579 tmp = kmalloc(sizeof(struct ctl_table_header), GFP_KERNEL); 1579 tmp = kmalloc(sizeof(struct ctl_table_header), GFP_KERNEL);
@@ -1607,7 +1607,7 @@ void unregister_sysctl_table(struct ctl_table_header * header)
1607} 1607}
1608 1608
1609#else /* !CONFIG_SYSCTL */ 1609#else /* !CONFIG_SYSCTL */
1610struct ctl_table_header *register_sysctl_table(ctl_table * table) 1610struct ctl_table_header *register_sysctl_table(struct ctl_table * table)
1611{ 1611{
1612 return NULL; 1612 return NULL;
1613} 1613}
@@ -1700,7 +1700,7 @@ static int _proc_do_string(void* data, int maxlen, int write,
1700 * 1700 *
1701 * Returns 0 on success. 1701 * Returns 0 on success.
1702 */ 1702 */
1703int proc_dostring(ctl_table *table, int write, struct file *filp, 1703int proc_dostring(struct ctl_table *table, int write, struct file *filp,
1704 void __user *buffer, size_t *lenp, loff_t *ppos) 1704 void __user *buffer, size_t *lenp, loff_t *ppos)
1705{ 1705{
1706 return _proc_do_string(table->data, table->maxlen, write, filp, 1706 return _proc_do_string(table->data, table->maxlen, write, filp,
@@ -1727,7 +1727,7 @@ static int do_proc_dointvec_conv(int *negp, unsigned long *lvalp,
1727 return 0; 1727 return 0;
1728} 1728}
1729 1729
1730static int __do_proc_dointvec(void *tbl_data, ctl_table *table, 1730static int __do_proc_dointvec(void *tbl_data, struct ctl_table *table,
1731 int write, struct file *filp, void __user *buffer, 1731 int write, struct file *filp, void __user *buffer,
1732 size_t *lenp, loff_t *ppos, 1732 size_t *lenp, loff_t *ppos,
1733 int (*conv)(int *negp, unsigned long *lvalp, int *valp, 1733 int (*conv)(int *negp, unsigned long *lvalp, int *valp,
@@ -1837,7 +1837,7 @@ static int __do_proc_dointvec(void *tbl_data, ctl_table *table,
1837#undef TMPBUFLEN 1837#undef TMPBUFLEN
1838} 1838}
1839 1839
1840static int do_proc_dointvec(ctl_table *table, int write, struct file *filp, 1840static int do_proc_dointvec(struct ctl_table *table, int write, struct file *filp,
1841 void __user *buffer, size_t *lenp, loff_t *ppos, 1841 void __user *buffer, size_t *lenp, loff_t *ppos,
1842 int (*conv)(int *negp, unsigned long *lvalp, int *valp, 1842 int (*conv)(int *negp, unsigned long *lvalp, int *valp,
1843 int write, void *data), 1843 int write, void *data),
@@ -1861,7 +1861,7 @@ static int do_proc_dointvec(ctl_table *table, int write, struct file *filp,
1861 * 1861 *
1862 * Returns 0 on success. 1862 * Returns 0 on success.
1863 */ 1863 */
1864int proc_dointvec(ctl_table *table, int write, struct file *filp, 1864int proc_dointvec(struct ctl_table *table, int write, struct file *filp,
1865 void __user *buffer, size_t *lenp, loff_t *ppos) 1865 void __user *buffer, size_t *lenp, loff_t *ppos)
1866{ 1866{
1867 return do_proc_dointvec(table,write,filp,buffer,lenp,ppos, 1867 return do_proc_dointvec(table,write,filp,buffer,lenp,ppos,
@@ -1901,7 +1901,7 @@ static int do_proc_dointvec_bset_conv(int *negp, unsigned long *lvalp,
1901 * init may raise the set. 1901 * init may raise the set.
1902 */ 1902 */
1903 1903
1904int proc_dointvec_bset(ctl_table *table, int write, struct file *filp, 1904int proc_dointvec_bset(struct ctl_table *table, int write, struct file *filp,
1905 void __user *buffer, size_t *lenp, loff_t *ppos) 1905 void __user *buffer, size_t *lenp, loff_t *ppos)
1906{ 1906{
1907 int op; 1907 int op;
@@ -1918,7 +1918,7 @@ int proc_dointvec_bset(ctl_table *table, int write, struct file *filp,
1918/* 1918/*
1919 * Taint values can only be increased 1919 * Taint values can only be increased
1920 */ 1920 */
1921static int proc_dointvec_taint(ctl_table *table, int write, struct file *filp, 1921static int proc_dointvec_taint(struct ctl_table *table, int write, struct file *filp,
1922 void __user *buffer, size_t *lenp, loff_t *ppos) 1922 void __user *buffer, size_t *lenp, loff_t *ppos)
1923{ 1923{
1924 int op; 1924 int op;
@@ -1977,7 +1977,7 @@ static int do_proc_dointvec_minmax_conv(int *negp, unsigned long *lvalp,
1977 * 1977 *
1978 * Returns 0 on success. 1978 * Returns 0 on success.
1979 */ 1979 */
1980int proc_dointvec_minmax(ctl_table *table, int write, struct file *filp, 1980int proc_dointvec_minmax(struct ctl_table *table, int write, struct file *filp,
1981 void __user *buffer, size_t *lenp, loff_t *ppos) 1981 void __user *buffer, size_t *lenp, loff_t *ppos)
1982{ 1982{
1983 struct do_proc_dointvec_minmax_conv_param param = { 1983 struct do_proc_dointvec_minmax_conv_param param = {
@@ -1988,7 +1988,7 @@ int proc_dointvec_minmax(ctl_table *table, int write, struct file *filp,
1988 do_proc_dointvec_minmax_conv, &param); 1988 do_proc_dointvec_minmax_conv, &param);
1989} 1989}
1990 1990
1991static int __do_proc_doulongvec_minmax(void *data, ctl_table *table, int write, 1991static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int write,
1992 struct file *filp, 1992 struct file *filp,
1993 void __user *buffer, 1993 void __user *buffer,
1994 size_t *lenp, loff_t *ppos, 1994 size_t *lenp, loff_t *ppos,
@@ -2093,7 +2093,7 @@ static int __do_proc_doulongvec_minmax(void *data, ctl_table *table, int write,
2093#undef TMPBUFLEN 2093#undef TMPBUFLEN
2094} 2094}
2095 2095
2096static int do_proc_doulongvec_minmax(ctl_table *table, int write, 2096static int do_proc_doulongvec_minmax(struct ctl_table *table, int write,
2097 struct file *filp, 2097 struct file *filp,
2098 void __user *buffer, 2098 void __user *buffer,
2099 size_t *lenp, loff_t *ppos, 2099 size_t *lenp, loff_t *ppos,
@@ -2121,7 +2121,7 @@ static int do_proc_doulongvec_minmax(ctl_table *table, int write,
2121 * 2121 *
2122 * Returns 0 on success. 2122 * Returns 0 on success.
2123 */ 2123 */
2124int proc_doulongvec_minmax(ctl_table *table, int write, struct file *filp, 2124int proc_doulongvec_minmax(struct ctl_table *table, int write, struct file *filp,
2125 void __user *buffer, size_t *lenp, loff_t *ppos) 2125 void __user *buffer, size_t *lenp, loff_t *ppos)
2126{ 2126{
2127 return do_proc_doulongvec_minmax(table, write, filp, buffer, lenp, ppos, 1l, 1l); 2127 return do_proc_doulongvec_minmax(table, write, filp, buffer, lenp, ppos, 1l, 1l);
@@ -2145,7 +2145,7 @@ int proc_doulongvec_minmax(ctl_table *table, int write, struct file *filp,
2145 * 2145 *
2146 * Returns 0 on success. 2146 * Returns 0 on success.
2147 */ 2147 */
2148int proc_doulongvec_ms_jiffies_minmax(ctl_table *table, int write, 2148int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int write,
2149 struct file *filp, 2149 struct file *filp,
2150 void __user *buffer, 2150 void __user *buffer,
2151 size_t *lenp, loff_t *ppos) 2151 size_t *lenp, loff_t *ppos)
@@ -2238,7 +2238,7 @@ static int do_proc_dointvec_ms_jiffies_conv(int *negp, unsigned long *lvalp,
2238 * 2238 *
2239 * Returns 0 on success. 2239 * Returns 0 on success.
2240 */ 2240 */
2241int proc_dointvec_jiffies(ctl_table *table, int write, struct file *filp, 2241int proc_dointvec_jiffies(struct ctl_table *table, int write, struct file *filp,
2242 void __user *buffer, size_t *lenp, loff_t *ppos) 2242 void __user *buffer, size_t *lenp, loff_t *ppos)
2243{ 2243{
2244 return do_proc_dointvec(table,write,filp,buffer,lenp,ppos, 2244 return do_proc_dointvec(table,write,filp,buffer,lenp,ppos,
@@ -2261,7 +2261,7 @@ int proc_dointvec_jiffies(ctl_table *table, int write, struct file *filp,
2261 * 2261 *
2262 * Returns 0 on success. 2262 * Returns 0 on success.
2263 */ 2263 */
2264int proc_dointvec_userhz_jiffies(ctl_table *table, int write, struct file *filp, 2264int proc_dointvec_userhz_jiffies(struct ctl_table *table, int write, struct file *filp,
2265 void __user *buffer, size_t *lenp, loff_t *ppos) 2265 void __user *buffer, size_t *lenp, loff_t *ppos)
2266{ 2266{
2267 return do_proc_dointvec(table,write,filp,buffer,lenp,ppos, 2267 return do_proc_dointvec(table,write,filp,buffer,lenp,ppos,
@@ -2285,14 +2285,14 @@ int proc_dointvec_userhz_jiffies(ctl_table *table, int write, struct file *filp,
2285 * 2285 *
2286 * Returns 0 on success. 2286 * Returns 0 on success.
2287 */ 2287 */
2288int proc_dointvec_ms_jiffies(ctl_table *table, int write, struct file *filp, 2288int proc_dointvec_ms_jiffies(struct ctl_table *table, int write, struct file *filp,
2289 void __user *buffer, size_t *lenp, loff_t *ppos) 2289 void __user *buffer, size_t *lenp, loff_t *ppos)
2290{ 2290{
2291 return do_proc_dointvec(table, write, filp, buffer, lenp, ppos, 2291 return do_proc_dointvec(table, write, filp, buffer, lenp, ppos,
2292 do_proc_dointvec_ms_jiffies_conv, NULL); 2292 do_proc_dointvec_ms_jiffies_conv, NULL);
2293} 2293}
2294 2294
2295static int proc_do_cad_pid(ctl_table *table, int write, struct file *filp, 2295static int proc_do_cad_pid(struct ctl_table *table, int write, struct file *filp,
2296 void __user *buffer, size_t *lenp, loff_t *ppos) 2296 void __user *buffer, size_t *lenp, loff_t *ppos)
2297{ 2297{
2298 struct pid *new_pid; 2298 struct pid *new_pid;
@@ -2316,55 +2316,55 @@ static int proc_do_cad_pid(ctl_table *table, int write, struct file *filp,
2316 2316
2317#else /* CONFIG_PROC_FS */ 2317#else /* CONFIG_PROC_FS */
2318 2318
2319int proc_dostring(ctl_table *table, int write, struct file *filp, 2319int proc_dostring(struct ctl_table *table, int write, struct file *filp,
2320 void __user *buffer, size_t *lenp, loff_t *ppos) 2320 void __user *buffer, size_t *lenp, loff_t *ppos)
2321{ 2321{
2322 return -ENOSYS; 2322 return -ENOSYS;
2323} 2323}
2324 2324
2325int proc_dointvec(ctl_table *table, int write, struct file *filp, 2325int proc_dointvec(struct ctl_table *table, int write, struct file *filp,
2326 void __user *buffer, size_t *lenp, loff_t *ppos) 2326 void __user *buffer, size_t *lenp, loff_t *ppos)
2327{ 2327{
2328 return -ENOSYS; 2328 return -ENOSYS;
2329} 2329}
2330 2330
2331int proc_dointvec_bset(ctl_table *table, int write, struct file *filp, 2331int proc_dointvec_bset(struct ctl_table *table, int write, struct file *filp,
2332 void __user *buffer, size_t *lenp, loff_t *ppos) 2332 void __user *buffer, size_t *lenp, loff_t *ppos)
2333{ 2333{
2334 return -ENOSYS; 2334 return -ENOSYS;
2335} 2335}
2336 2336
2337int proc_dointvec_minmax(ctl_table *table, int write, struct file *filp, 2337int proc_dointvec_minmax(struct ctl_table *table, int write, struct file *filp,
2338 void __user *buffer, size_t *lenp, loff_t *ppos) 2338 void __user *buffer, size_t *lenp, loff_t *ppos)
2339{ 2339{
2340 return -ENOSYS; 2340 return -ENOSYS;
2341} 2341}
2342 2342
2343int proc_dointvec_jiffies(ctl_table *table, int write, struct file *filp, 2343int proc_dointvec_jiffies(struct ctl_table *table, int write, struct file *filp,
2344 void __user *buffer, size_t *lenp, loff_t *ppos) 2344 void __user *buffer, size_t *lenp, loff_t *ppos)
2345{ 2345{
2346 return -ENOSYS; 2346 return -ENOSYS;
2347} 2347}
2348 2348
2349int proc_dointvec_userhz_jiffies(ctl_table *table, int write, struct file *filp, 2349int proc_dointvec_userhz_jiffies(struct ctl_table *table, int write, struct file *filp,
2350 void __user *buffer, size_t *lenp, loff_t *ppos) 2350 void __user *buffer, size_t *lenp, loff_t *ppos)
2351{ 2351{
2352 return -ENOSYS; 2352 return -ENOSYS;
2353} 2353}
2354 2354
2355int proc_dointvec_ms_jiffies(ctl_table *table, int write, struct file *filp, 2355int proc_dointvec_ms_jiffies(struct ctl_table *table, int write, struct file *filp,
2356 void __user *buffer, size_t *lenp, loff_t *ppos) 2356 void __user *buffer, size_t *lenp, loff_t *ppos)
2357{ 2357{
2358 return -ENOSYS; 2358 return -ENOSYS;
2359} 2359}
2360 2360
2361int proc_doulongvec_minmax(ctl_table *table, int write, struct file *filp, 2361int proc_doulongvec_minmax(struct ctl_table *table, int write, struct file *filp,
2362 void __user *buffer, size_t *lenp, loff_t *ppos) 2362 void __user *buffer, size_t *lenp, loff_t *ppos)
2363{ 2363{
2364 return -ENOSYS; 2364 return -ENOSYS;
2365} 2365}
2366 2366
2367int proc_doulongvec_ms_jiffies_minmax(ctl_table *table, int write, 2367int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int write,
2368 struct file *filp, 2368 struct file *filp,
2369 void __user *buffer, 2369 void __user *buffer,
2370 size_t *lenp, loff_t *ppos) 2370 size_t *lenp, loff_t *ppos)
@@ -2382,7 +2382,7 @@ int proc_doulongvec_ms_jiffies_minmax(ctl_table *table, int write,
2382 */ 2382 */
2383 2383
2384/* The generic string strategy routine: */ 2384/* The generic string strategy routine: */
2385int sysctl_string(ctl_table *table, int __user *name, int nlen, 2385int sysctl_string(struct ctl_table *table, int __user *name, int nlen,
2386 void __user *oldval, size_t __user *oldlenp, 2386 void __user *oldval, size_t __user *oldlenp,
2387 void __user *newval, size_t newlen) 2387 void __user *newval, size_t newlen)
2388{ 2388{
@@ -2428,7 +2428,7 @@ int sysctl_string(ctl_table *table, int __user *name, int nlen,
2428 * are between the minimum and maximum values given in the arrays 2428 * are between the minimum and maximum values given in the arrays
2429 * table->extra1 and table->extra2, respectively. 2429 * table->extra1 and table->extra2, respectively.
2430 */ 2430 */
2431int sysctl_intvec(ctl_table *table, int __user *name, int nlen, 2431int sysctl_intvec(struct ctl_table *table, int __user *name, int nlen,
2432 void __user *oldval, size_t __user *oldlenp, 2432 void __user *oldval, size_t __user *oldlenp,
2433 void __user *newval, size_t newlen) 2433 void __user *newval, size_t newlen)
2434{ 2434{
@@ -2464,7 +2464,7 @@ int sysctl_intvec(ctl_table *table, int __user *name, int nlen,
2464} 2464}
2465 2465
2466/* Strategy function to convert jiffies to seconds */ 2466/* Strategy function to convert jiffies to seconds */
2467int sysctl_jiffies(ctl_table *table, int __user *name, int nlen, 2467int sysctl_jiffies(struct ctl_table *table, int __user *name, int nlen,
2468 void __user *oldval, size_t __user *oldlenp, 2468 void __user *oldval, size_t __user *oldlenp,
2469 void __user *newval, size_t newlen) 2469 void __user *newval, size_t newlen)
2470{ 2470{
@@ -2498,7 +2498,7 @@ int sysctl_jiffies(ctl_table *table, int __user *name, int nlen,
2498} 2498}
2499 2499
2500/* Strategy function to convert jiffies to seconds */ 2500/* Strategy function to convert jiffies to seconds */
2501int sysctl_ms_jiffies(ctl_table *table, int __user *name, int nlen, 2501int sysctl_ms_jiffies(struct ctl_table *table, int __user *name, int nlen,
2502 void __user *oldval, size_t __user *oldlenp, 2502 void __user *oldval, size_t __user *oldlenp,
2503 void __user *newval, size_t newlen) 2503 void __user *newval, size_t newlen)
2504{ 2504{
@@ -2569,28 +2569,28 @@ out:
2569 return -ENOSYS; 2569 return -ENOSYS;
2570} 2570}
2571 2571
2572int sysctl_string(ctl_table *table, int __user *name, int nlen, 2572int sysctl_string(struct ctl_table *table, int __user *name, int nlen,
2573 void __user *oldval, size_t __user *oldlenp, 2573 void __user *oldval, size_t __user *oldlenp,
2574 void __user *newval, size_t newlen) 2574 void __user *newval, size_t newlen)
2575{ 2575{
2576 return -ENOSYS; 2576 return -ENOSYS;
2577} 2577}
2578 2578
2579int sysctl_intvec(ctl_table *table, int __user *name, int nlen, 2579int sysctl_intvec(struct ctl_table *table, int __user *name, int nlen,
2580 void __user *oldval, size_t __user *oldlenp, 2580 void __user *oldval, size_t __user *oldlenp,
2581 void __user *newval, size_t newlen) 2581 void __user *newval, size_t newlen)
2582{ 2582{
2583 return -ENOSYS; 2583 return -ENOSYS;
2584} 2584}
2585 2585
2586int sysctl_jiffies(ctl_table *table, int __user *name, int nlen, 2586int sysctl_jiffies(struct ctl_table *table, int __user *name, int nlen,
2587 void __user *oldval, size_t __user *oldlenp, 2587 void __user *oldval, size_t __user *oldlenp,
2588 void __user *newval, size_t newlen) 2588 void __user *newval, size_t newlen)
2589{ 2589{
2590 return -ENOSYS; 2590 return -ENOSYS;
2591} 2591}
2592 2592
2593int sysctl_ms_jiffies(ctl_table *table, int __user *name, int nlen, 2593int sysctl_ms_jiffies(struct ctl_table *table, int __user *name, int nlen,
2594 void __user *oldval, size_t __user *oldlenp, 2594 void __user *oldval, size_t __user *oldlenp,
2595 void __user *newval, size_t newlen) 2595 void __user *newval, size_t newlen)
2596{ 2596{