diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-05 02:13:24 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-05 02:13:24 -0400 |
| commit | 9c2edd8b5bcb36ec6c890dd85f8fd13034aaa43e (patch) | |
| tree | 052b3c229e00462cd0c5773c8b6b9fe314e86f38 /include/linux/sysctl.h | |
| parent | aa652b1ccbd0d3a9cd4ecdec6d36935f78c838da (diff) | |
| parent | c6935931c1894ff857616ff8549b61236a19148f (diff) | |
Merge 4.8-rc5 into staging-next
We want the staging fixes in here as well to handle merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/sysctl.h')
| -rw-r--r-- | include/linux/sysctl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 697e160c78d0..a4f7203a9017 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h | |||
| @@ -42,6 +42,8 @@ extern int proc_dostring(struct ctl_table *, int, | |||
| 42 | void __user *, size_t *, loff_t *); | 42 | void __user *, size_t *, loff_t *); |
| 43 | extern int proc_dointvec(struct ctl_table *, int, | 43 | extern int proc_dointvec(struct ctl_table *, int, |
| 44 | void __user *, size_t *, loff_t *); | 44 | void __user *, size_t *, loff_t *); |
| 45 | extern int proc_douintvec(struct ctl_table *, int, | ||
| 46 | void __user *, size_t *, loff_t *); | ||
| 45 | extern int proc_dointvec_minmax(struct ctl_table *, int, | 47 | extern int proc_dointvec_minmax(struct ctl_table *, int, |
| 46 | void __user *, size_t *, loff_t *); | 48 | void __user *, size_t *, loff_t *); |
| 47 | extern int proc_dointvec_jiffies(struct ctl_table *, int, | 49 | extern int proc_dointvec_jiffies(struct ctl_table *, int, |