From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 20 Feb 2013 02:13:59 +0000 (+1100)
Subject: mm/page_alloc.c:__alloc_contig_migrate_range(): cleanup
X-Git-Tag: next-20130220~1^2~592
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bf97949333c631c5083123b710660ba257db6b98;p=karo-tx-linux.git

mm/page_alloc.c:__alloc_contig_migrate_range(): cleanup

remove a test-n-branch in the wrapup code

Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 5948a77994bb..9acd27e5dc2b 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5806,9 +5806,11 @@ static int __alloc_contig_migrate_range(struct compact_control *cc,
 				    0, false, MIGRATE_SYNC,
 				    MR_CMA);
 	}
-	if (ret < 0)
+	if (ret < 0) {
 		putback_movable_pages(&cc->migratepages);
-	return ret > 0 ? 0 : ret;
+		return ret;
+	}
+	return 0;
 }
 
 /**