diff options
author | Joel Stanley <joel@jms.id.au> | 2019-04-08 12:35:00 +0930 |
---|---|---|
committer | Joel Stanley <joel@jms.id.au> | 2019-04-08 12:35:05 +0930 |
commit | 0b37f9a0bd24d9622f75d981feac67e72351b6e8 (patch) | |
tree | d40154b713e136a2d9dfb3fcb1903dd730bd234f /kernel/sysctl.c | |
parent | df66fbc97853fbba90a0bfa44de32f3d5f7602b4 (diff) | |
parent | 8b298d3a0bd5feeb47129c4889356b38b78ab231 (diff) | |
download | talos-obmc-linux-0b37f9a0bd24d9622f75d981feac67e72351b6e8.tar.gz talos-obmc-linux-0b37f9a0bd24d9622f75d981feac67e72351b6e8.zip |
Merge tag 'v5.0.7' into dev-5.0
This is the 5.0.7 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index d80bee8ff12e..28ec71d914c7 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -127,6 +127,7 @@ static int __maybe_unused one = 1; static int __maybe_unused two = 2; static int __maybe_unused four = 4; static unsigned long one_ul = 1; +static unsigned long long_max = LONG_MAX; static int one_hundred = 100; static int one_thousand = 1000; #ifdef CONFIG_PRINTK @@ -1722,6 +1723,8 @@ static struct ctl_table fs_table[] = { .maxlen = sizeof(files_stat.max_files), .mode = 0644, .proc_handler = proc_doulongvec_minmax, + .extra1 = &zero, + .extra2 = &long_max, }, { .procname = "nr_open", |