diff options
| author | David S. Miller <[email protected]> | 2019-04-08 23:39:36 -0700 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2019-04-08 23:39:36 -0700 |
| commit | 310655b07ae8ef0b8fdb641b610ded2052215664 (patch) | |
| tree | d9b7a500ef21a087a337e1f1bb9218000cf1c03d /kernel/sysctl.c | |
| parent | 7f301cff1fc20c5b91203c5e610cf95782081d5d (diff) | |
| parent | 869e3305f23dfeacdaa234717c92ccb237815d90 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index e5da394d1ca3..c9ec050bcf46 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -128,6 +128,7 @@ static int zero; static int __maybe_unused one = 1; static int __maybe_unused two = 2; static int __maybe_unused four = 4; +static unsigned long zero_ul; static unsigned long one_ul = 1; static unsigned long long_max = LONG_MAX; static int one_hundred = 100; @@ -1750,7 +1751,7 @@ static struct ctl_table fs_table[] = { .maxlen = sizeof(files_stat.max_files), .mode = 0644, .proc_handler = proc_doulongvec_minmax, - .extra1 = &zero, + .extra1 = &zero_ul, .extra2 = &long_max, }, { |