|
@@ -2295,9 +2295,8 @@ static inline bool compaction_ready(struct zone *zone, struct scan_control *sc)
|
|
|
* there is a buffer of free pages available to give compaction
|
|
|
* a reasonable chance of completing and allocating the page
|
|
|
*/
|
|
|
- balance_gap = min(low_wmark_pages(zone),
|
|
|
- (zone->managed_pages + KSWAPD_ZONE_BALANCE_GAP_RATIO-1) /
|
|
|
- KSWAPD_ZONE_BALANCE_GAP_RATIO);
|
|
|
+ balance_gap = min(low_wmark_pages(zone), DIV_ROUND_UP(
|
|
|
+ zone->managed_pages, KSWAPD_ZONE_BALANCE_GAP_RATIO));
|
|
|
watermark = high_wmark_pages(zone) + balance_gap + (2UL << sc->order);
|
|
|
watermark_ok = zone_watermark_ok_safe(zone, 0, watermark, 0, 0);
|
|
|
|
|
@@ -2949,9 +2948,8 @@ static bool kswapd_shrink_zone(struct zone *zone,
|
|
|
* high wmark plus a "gap" where the gap is either the low
|
|
|
* watermark or 1% of the zone, whichever is smaller.
|
|
|
*/
|
|
|
- balance_gap = min(low_wmark_pages(zone),
|
|
|
- (zone->managed_pages + KSWAPD_ZONE_BALANCE_GAP_RATIO-1) /
|
|
|
- KSWAPD_ZONE_BALANCE_GAP_RATIO);
|
|
|
+ balance_gap = min(low_wmark_pages(zone), DIV_ROUND_UP(
|
|
|
+ zone->managed_pages, KSWAPD_ZONE_BALANCE_GAP_RATIO));
|
|
|
|
|
|
/*
|
|
|
* If there is no low memory pressure or the zone is balanced then no
|