From 3fbd78907cd07c889b96675cded501f0a8dd8a27 Mon Sep 17 00:00:00 2001 From: Mel Gorman Date: Mon, 8 Oct 2012 16:29:09 -0700 Subject: [PATCH] --- yaml --- r: 332347 b: refs/heads/master c: 4ffb6335da87b51c17e7ff6495170785f21558dd h: refs/heads/master i: 332345: a2e93d1c3a04ff2d1c5620f3a29d2c1232b0ad07 332343: de7410c708ce38b6259d373ba6b990336848d8e4 v: v3 --- [refs] | 2 +- trunk/mm/compaction.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index c5a80dea9c7e..2d0dd0773fe8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6597d783397aebb793fb529474cce5089aa4c67f +refs/heads/master: 4ffb6335da87b51c17e7ff6495170785f21558dd diff --git a/trunk/mm/compaction.c b/trunk/mm/compaction.c index 7fcd3a52e68d..7168edc7592c 100644 --- a/trunk/mm/compaction.c +++ b/trunk/mm/compaction.c @@ -869,11 +869,7 @@ unsigned long try_to_compact_pages(struct zonelist *zonelist, struct zone *zone; int rc = COMPACT_SKIPPED; - /* - * Check whether it is worth even starting compaction. The order check is - * made because an assumption is made that the page allocator can satisfy - * the "cheaper" orders without taking special steps - */ + /* Check if the GFP flags allow compaction */ if (!order || !may_enter_fs || !may_perform_io) return rc;