diff options
author | Ingo Molnar | 2015-05-19 08:37:30 +0200 |
---|---|---|
committer | Ingo Molnar | 2015-05-19 08:37:30 +0200 |
commit | a22ae718067c233af790b8690b3d8f6190859ead (patch) | |
tree | 2e96c72b4b231f9302f0000a8702e4f21456e90b /mm/page-writeback.c | |
parent | sched: Fix function declaration return type mismatch (diff) | |
parent | Linux 4.1-rc4 (diff) | |
download | kernel-qcow2-linux-a22ae718067c233af790b8690b3d8f6190859ead.tar.gz kernel-qcow2-linux-a22ae718067c233af790b8690b3d8f6190859ead.tar.xz kernel-qcow2-linux-a22ae718067c233af790b8690b3d8f6190859ead.zip |
Merge tag 'v4.1-rc4' into sched/core, before applying new patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/page-writeback.c')
-rw-r--r-- | mm/page-writeback.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 5daf5568b9e1..eb59f7eea508 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -580,7 +580,7 @@ static long long pos_ratio_polynom(unsigned long setpoint, long x; x = div64_s64(((s64)setpoint - (s64)dirty) << RATELIMIT_CALC_SHIFT, - limit - setpoint + 1); + (limit - setpoint) | 1); pos_ratio = x; pos_ratio = pos_ratio * x >> RATELIMIT_CALC_SHIFT; pos_ratio = pos_ratio * x >> RATELIMIT_CALC_SHIFT; @@ -807,7 +807,7 @@ static unsigned long bdi_position_ratio(struct backing_dev_info *bdi, * scale global setpoint to bdi's: * bdi_setpoint = setpoint * bdi_thresh / thresh */ - x = div_u64((u64)bdi_thresh << 16, thresh + 1); + x = div_u64((u64)bdi_thresh << 16, thresh | 1); bdi_setpoint = setpoint * (u64)x >> 16; /* * Use span=(8*write_bw) in single bdi case as indicated by @@ -822,7 +822,7 @@ static unsigned long bdi_position_ratio(struct backing_dev_info *bdi, if (bdi_dirty < x_intercept - span / 4) { pos_ratio = div64_u64(pos_ratio * (x_intercept - bdi_dirty), - x_intercept - bdi_setpoint + 1); + (x_intercept - bdi_setpoint) | 1); } else pos_ratio /= 4; |