From: Bob Liu <lliubbo@gmail.com>
Date: Thu, 25 Oct 2012 20:37:56 +0000 (-0700)
Subject: mm/page_alloc.c:alloc_contig_range(): return early for err path
X-Git-Tag: upstream/snapshot3+hdmi~6340^2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=86a595f961360c9c31d00fb111dd09e5d5ba9a40;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

mm/page_alloc.c:alloc_contig_range(): return early for err path

If start_isolate_page_range() failed, unset_migratetype_isolate() has been
done inside it.

Signed-off-by: Bob Liu <lliubbo@gmail.com>
Cc: Ni zhan Chen <nizhan.chen@gmail.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index bb90971..b0012ab 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5825,7 +5825,7 @@ int alloc_contig_range(unsigned long start, unsigned long end,
 	ret = start_isolate_page_range(pfn_max_align_down(start),
 				       pfn_max_align_up(end), migratetype);
 	if (ret)
-		goto done;
+		return ret;
 
 	ret = __alloc_contig_migrate_range(&cc, start, end);
 	if (ret)