From b70caee70bfcbc36d17e82ac19a3ce8b01cf38d8 Mon Sep 17 00:00:00 2001 From: Minchan Kim Date: Tue, 21 Aug 2012 16:16:03 -0700 Subject: [PATCH] --- yaml --- r: 322080 b: refs/heads/master c: c81758fbe0fdbbc0c74b37798f55bd9c91d5c068 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/compaction.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7f66eb0aac77..02bb4d59ea01 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7838f994b4fceff24c343f4e26a6cf4393869579 +refs/heads/master: c81758fbe0fdbbc0c74b37798f55bd9c91d5c068 diff --git a/trunk/mm/compaction.c b/trunk/mm/compaction.c index e78cb9688421..b6984e234fdf 100644 --- a/trunk/mm/compaction.c +++ b/trunk/mm/compaction.c @@ -861,7 +861,7 @@ static int __compact_pgdat(pg_data_t *pgdat, struct compact_control *cc) if (cc->order > 0) { int ok = zone_watermark_ok(zone, cc->order, low_wmark_pages(zone), 0, 0); - if (ok && cc->order > zone->compact_order_failed) + if (ok && cc->order >= zone->compact_order_failed) zone->compact_order_failed = cc->order + 1; /* Currently async compaction is never deferred. */ else if (!ok && cc->sync)