From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 7 Feb 2013 01:26:10 +0000 (+1100)
Subject: mm/page_alloc.c:__alloc_contig_migrate_range(): cleanup
X-Git-Tag: next-20130218~1^2~504
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=260ad20d66cb0c403d2cc73db63bc95779c075df;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 d2661f5741fb..b7d130848208 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5803,9 +5803,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;
 }
 
 /**