diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-04 12:11:15 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-04 12:11:15 +0800 |
| commit | efa59a01f75e4b1e1b870cbdbb4ffd5a0ab27caf (patch) | |
| tree | 8c2c47b41e574ccf34df7057bb7e8448e6e7404c /kernel | |
| parent | 261e8dbdb94baf294d0c8d45de843bb3d928c90e (diff) | |
| parent | 6c1ed78cb07494c721e9849c92987d029a2e816f (diff) | |
Merge tag 'v4.4.46' into linux-linaro-lsk-v4.4
This is the 4.4.46 stable release
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sysctl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 999e025bf68e..2f0d157258a2 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -2414,6 +2414,7 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int break; if (neg) continue; + val = convmul * val / convdiv; if ((min && val < *min) || (max && val > *max)) continue; *i = val; |