---

yaml --- r: 343313 b: refs/heads/master c: be49a6e h: refs/heads/master i: 343311: cde28a7 v: v3
git-mirror · Dec 13, 2012 · c30fd4b · c30fd4b
1 parent e562365
commit c30fd4b
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: c8bf2d8ba4fbc093de7c0d192fe5d2531f14b8b9
+refs/heads/master: be49a6e13537f32f85bd8c4ba04317ca36ca60ff
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -5727,7 +5727,7 @@ static int __alloc_contig_migrate_range(struct compact_control *cc,
 	unsigned int tries = 0;
 	int ret = 0;
 
-	migrate_prep_local();
+	migrate_prep();
 
 	while (pfn < end || !list_empty(&cc->migratepages)) {
 		if (fatal_signal_pending(current)) {