Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 336246
b: refs/heads/master
c: c702418
h: refs/heads/master
v: v3
  • Loading branch information
Johannes Weiner authored and Linus Torvalds committed Dec 6, 2012
1 parent fac1dfc commit 69cd321
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 60177d31d215bc2b4c5a7aa6f742800e04fa0a92
refs/heads/master: c702418f8a2fa6cc92e84a39880d458faf7af9cc
16 changes: 0 additions & 16 deletions trunk/mm/vmscan.c
Original file line number Diff line number Diff line change
Expand Up @@ -2823,22 +2823,6 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, int order,
if (!populated_zone(zone))
continue;

if (zone->all_unreclaimable &&
sc.priority != DEF_PRIORITY)
continue;

/* Would compaction fail due to lack of free memory? */
if (COMPACTION_BUILD &&
compaction_suitable(zone, order) == COMPACT_SKIPPED)
goto loop_again;

/* Confirm the zone is balanced for order-0 */
if (!zone_watermark_ok(zone, 0,
high_wmark_pages(zone), 0, 0)) {
order = sc.order = 0;
goto loop_again;
}

/* Check if the memory needs to be defragmented. */
if (zone_watermark_ok(zone, order,
low_wmark_pages(zone), *classzone_idx, 0))
Expand Down

0 comments on commit 69cd321

Please sign in to comment.