diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/sysctl.h | 5 | ||||
-rw-r--r-- | include/net/ip.h | 3 | ||||
-rw-r--r-- | include/net/sctp/sctp.h | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 94316a98e0d0..6d8846e7be6d 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h | |||
@@ -918,8 +918,7 @@ typedef struct ctl_table ctl_table; | |||
918 | 918 | ||
919 | typedef int ctl_handler (ctl_table *table, int __user *name, int nlen, | 919 | typedef int ctl_handler (ctl_table *table, int __user *name, int nlen, |
920 | void __user *oldval, size_t __user *oldlenp, | 920 | void __user *oldval, size_t __user *oldlenp, |
921 | void __user *newval, size_t newlen, | 921 | void __user *newval, size_t newlen); |
922 | void **context); | ||
923 | 922 | ||
924 | typedef int proc_handler (ctl_table *ctl, int write, struct file * filp, | 923 | typedef int proc_handler (ctl_table *ctl, int write, struct file * filp, |
925 | void __user *buffer, size_t *lenp, loff_t *ppos); | 924 | void __user *buffer, size_t *lenp, loff_t *ppos); |
@@ -950,7 +949,7 @@ extern int do_sysctl (int __user *name, int nlen, | |||
950 | extern int do_sysctl_strategy (ctl_table *table, | 949 | extern int do_sysctl_strategy (ctl_table *table, |
951 | int __user *name, int nlen, | 950 | int __user *name, int nlen, |
952 | void __user *oldval, size_t __user *oldlenp, | 951 | void __user *oldval, size_t __user *oldlenp, |
953 | void __user *newval, size_t newlen, void ** context); | 952 | void __user *newval, size_t newlen); |
954 | 953 | ||
955 | extern ctl_handler sysctl_string; | 954 | extern ctl_handler sysctl_string; |
956 | extern ctl_handler sysctl_intvec; | 955 | extern ctl_handler sysctl_intvec; |
diff --git a/include/net/ip.h b/include/net/ip.h index 83cb9ac5554e..053f02b5cb89 100644 --- a/include/net/ip.h +++ b/include/net/ip.h | |||
@@ -376,8 +376,7 @@ int ipv4_doint_and_flush(ctl_table *ctl, int write, | |||
376 | size_t *lenp, loff_t *ppos); | 376 | size_t *lenp, loff_t *ppos); |
377 | int ipv4_doint_and_flush_strategy(ctl_table *table, int __user *name, int nlen, | 377 | int ipv4_doint_and_flush_strategy(ctl_table *table, int __user *name, int nlen, |
378 | void __user *oldval, size_t __user *oldlenp, | 378 | void __user *oldval, size_t __user *oldlenp, |
379 | void __user *newval, size_t newlen, | 379 | void __user *newval, size_t newlen); |
380 | void **context); | ||
381 | #ifdef CONFIG_PROC_FS | 380 | #ifdef CONFIG_PROC_FS |
382 | extern int ip_misc_proc_init(void); | 381 | extern int ip_misc_proc_init(void); |
383 | #endif | 382 | #endif |
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index 215461f18db1..c818f87122af 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h | |||
@@ -368,7 +368,7 @@ static inline void sctp_sysctl_register(void) { return; } | |||
368 | static inline void sctp_sysctl_unregister(void) { return; } | 368 | static inline void sctp_sysctl_unregister(void) { return; } |
369 | static inline int sctp_sysctl_jiffies_ms(ctl_table *table, int __user *name, int nlen, | 369 | static inline int sctp_sysctl_jiffies_ms(ctl_table *table, int __user *name, int nlen, |
370 | void __user *oldval, size_t __user *oldlenp, | 370 | void __user *oldval, size_t __user *oldlenp, |
371 | void __user *newval, size_t newlen, void **context) { | 371 | void __user *newval, size_t newlen) { |
372 | return -ENOSYS; | 372 | return -ENOSYS; |
373 | } | 373 | } |
374 | #endif | 374 | #endif |