diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-04 12:11:17 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-04 12:11:17 +0800 |
| commit | 5bee6fb934ecb5c3eac5aa05b3c39505a4c130ad (patch) | |
| tree | 78d053de0c0e7f8d88edf9b967a470868ad55f8e /kernel | |
| parent | b4bbeeb816c06fd59dea2ea82c7b5650eb185e65 (diff) | |
| parent | efa59a01f75e4b1e1b870cbdbb4ffd5a0ab27caf (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
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 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; |