From d409b43abfcd57ae7c54bd2f71b3084aab335070 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 21 Mar 2012 16:33:54 -0700 Subject: [PATCH] --- yaml --- r: 292627 b: refs/heads/master c: aad6ec3777bf4930d4f7293745cc4c17a2d87947 h: refs/heads/master i: 292625: 1b081098848236e066d12045058f9e8cfd223c64 292623: 04ea745a5a38d8992d841afa306a4761901b23ac v: v3 --- [refs] | 2 +- trunk/mm/compaction.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 295a164c8fd8..c95949517f35 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8575ec29f61da83a2bf382c8c490499dc022101e +refs/heads/master: aad6ec3777bf4930d4f7293745cc4c17a2d87947 diff --git a/trunk/mm/compaction.c b/trunk/mm/compaction.c index a08bf219f88c..74a8c825ff28 100644 --- a/trunk/mm/compaction.c +++ b/trunk/mm/compaction.c @@ -35,7 +35,7 @@ struct compact_control { unsigned long migrate_pfn; /* isolate_migratepages search base */ bool sync; /* Synchronous migration */ - unsigned int order; /* order a direct compactor needs */ + int order; /* order a direct compactor needs */ int migratetype; /* MOVABLE, RECLAIMABLE etc */ struct zone *zone; }; @@ -692,7 +692,7 @@ static int __compact_pgdat(pg_data_t *pgdat, struct compact_control *cc) INIT_LIST_HEAD(&cc->freepages); INIT_LIST_HEAD(&cc->migratepages); - if (cc->order < 0 || !compaction_deferred(zone, cc->order)) + if (cc->order == -1 || !compaction_deferred(zone, cc->order)) compact_zone(zone, cc); if (cc->order > 0) {