diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2017-02-01 12:55:09 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-02-01 12:55:09 -0800 |
| commit | c8da41f0dc8d6cf25494b8462bf5875bda2e3568 (patch) | |
| tree | 395862f05525f0f1ee87cb680891d1831f5cf021 /kernel/sysctl.c | |
| parent | e9a82a4cbe64b78d72c3adaea73352d2b9bab895 (diff) | |
| parent | 6c1ed78cb07494c721e9849c92987d029a2e816f (diff) | |
Merge tag 'v4.4.46' into android-4.4.y
This is the 4.4.46 stable release
Diffstat (limited to 'kernel/sysctl.c')
| -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 abb795e8a6f1..d2f8f2d2332f 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -2518,6 +2518,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; |