mm-compaction-abort-compaction-loop-if-lock-is-contended-or-run-too-long-fix

make compact_zone_order() require non-NULL arg `contended'

Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Shaohua Li <shli@fusionio.com>
Cc: Shaohua Li <shli@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/compaction.c b/mm/compaction.c
index 6a6bb4b3b18dc14cdef48fb01c8a71612034af25..36ff6079ba1e06cd4556b11222eda5e0b700c703 100644 (file)
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -909,8 +909,7 @@ static unsigned long compact_zone_order(struct zone *zone,
        INIT_LIST_HEAD(&cc.migratepages);
 
        ret = compact_zone(zone, &cc);
-       if (contended)
-               *contended = cc.contended;
+       *contended = cc.contended;
        return ret;
 }