From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 26 Sep 2012 01:33:49 +0000 (+1000)
Subject: mm-compaction-abort-compaction-loop-if-lock-is-contended-or-run-too-long-fix
X-Git-Tag: next-20120926~2^2~244
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=aacb3b4e8c75f423c3e47a9a15bdd60abb3b4241;p=karo-tx-linux.git

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 197d4ee76672..7c3bd79b3310 100644
--- 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;
 }