From c30fd4b15e128eda5fbf51b6d6f41a36456c0e08 Mon Sep 17 00:00:00 2001
From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Wed, 12 Dec 2012 13:51:19 -0800
Subject: [PATCH] --- yaml --- r: 343313 b: refs/heads/master c:
 be49a6e13537f32f85bd8c4ba04317ca36ca60ff h: refs/heads/master i:   343311:
 cde28a7d26a2a92d8febcee0cbd4c4129db94763 v: v3

---
 [refs]                | 2 +-
 trunk/mm/page_alloc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6b680ddd4a1b..9d719f6aea9b 100644
--- 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
index 5a8d339d282a..4171cd4f8257 100644
--- 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)) {