---

yaml --- r: 356484 b: refs/heads/master c: 2a6f512 h: refs/heads/master v: v3
git-mirror · Feb 24, 2013 · 23bd3df · 23bd3df
1 parent b3615d5
commit 23bd3df
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffb22af5b7a5d6c04eec22253d6d368bc8e6cd3d
+refs/heads/master: 2a6f512412c7aecd04134721ea392cc496e6c017
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -5806,9 +5806,11 @@ static int __alloc_contig_migrate_range(struct compact_control *cc,
 				    0, false, MIGRATE_SYNC,
 				    MR_CMA);
 	}
-
-	putback_movable_pages(&cc->migratepages);
-	return ret > 0 ? 0 : ret;
+	if (ret < 0) {
+		putback_movable_pages(&cc->migratepages);
+		return ret;
+	}
+	return 0;
 }
 
 /**