From 2a4752175244c99979a64337131d9f7d2f77b8a4 Mon Sep 17 00:00:00 2001
From: Konstantin Khlebnikov <khlebnikov@openvz.org>
Date: Fri, 3 Feb 2012 15:37:13 -0800
Subject: [PATCH] --- yaml --- r: 287211 b: refs/heads/master c:
 35512ecaef03250fe50ad81430dd467f01d9a96b h: refs/heads/master i:   287209:
 f1d800b999471ad1ad82b710991f9fdc1e1b7915   287207:
 56b072e4ea12f7eec362d29094a0f63324eb4289 v: v3

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

diff --git a/[refs] b/[refs]
index afd074c4aa67..7e3d9479d58e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1b58c237b73f10221b31e05b47a6565558207ef
+refs/heads/master: 35512ecaef03250fe50ad81430dd467f01d9a96b
diff --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c
index 9871a56d82c3..df141f60289e 100644
--- a/trunk/mm/migrate.c
+++ b/trunk/mm/migrate.c
@@ -445,7 +445,6 @@ void migrate_page_copy(struct page *newpage, struct page *page)
 	ClearPageSwapCache(page);
 	ClearPagePrivate(page);
 	set_page_private(page, 0);
-	page->mapping = NULL;
 
 	/*
 	 * If any waiters have accumulated on the new page then
@@ -667,6 +666,7 @@ static int move_to_new_page(struct page *newpage, struct page *page,
 	} else {
 		if (remap_swapcache)
 			remove_migration_ptes(page, newpage);
+		page->mapping = NULL;
 	}
 
 	unlock_page(newpage);