diff options
| author | Con Kolivas <kernel@kolivas.org> | 2016-10-21 08:04:32 +1100 |
|---|---|---|
| committer | Con Kolivas <kernel@kolivas.org> | 2016-10-21 11:08:30 +1100 |
| commit | 6caa689a9a9d2817e2a77a033dc32b37e3cd3d68 (patch) | |
| tree | ab4acc8d2068b57f3337f9a67effaae7ebba205a /kernel | |
| parent | 7e3bed6f6616eef73529c7bc84416bf29700f2e7 (diff) | |
Clamp niffy diff to max diff if it's over instead of min diff.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/MuQSS.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/sched/MuQSS.c b/kernel/sched/MuQSS.c index 513efb1754fc..f6df6702fa8f 100644 --- a/kernel/sched/MuQSS.c +++ b/kernel/sched/MuQSS.c @@ -280,8 +280,10 @@ static inline void niffy_diff(s64 *niff_diff, int jiff_diff) /* Round up to the nearest tick for maximum */ max_diff = JIFFIES_TO_NS(jiff_diff + 1); - if (unlikely(*niff_diff < min_diff || *niff_diff > max_diff)) + if (unlikely(*niff_diff < min_diff)) *niff_diff = min_diff; + else if (unlikely(*niff_diff > max_diff)) + *niff_diff = max_diff; } #ifdef CONFIG_SMP |