---

yaml --- r: 334825 b: refs/heads/master c: a1f1021 h: refs/heads/master i: 334823: be8927b v: v3
git-mirror · Oct 23, 2012 · 0a7f739 · 0a7f739
1 parent 3b28655
commit 0a7f739
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e97f3f918c27c68c092bdca7917266615aec62f
+refs/heads/master: a1f102136538553a9488c713a336065ebb567542
diff --git a/trunk/mm/page_alloc.c b/trunk/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)