From 81a3678674a4ef1fe1e49d1df48e295d97a89a21 Mon Sep 17 00:00:00 2001
From: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Date: Fri, 10 Sep 2010 13:23:03 +0900
Subject: [PATCH] --- yaml --- r: 210937 b: refs/heads/master c:
 433abed6c6f76ca079a9564f2a1a51fd28ebe0ca h: refs/heads/master i:   210935:
 1add4aae48402aeae90fda8c4764c721f104d8a8 v: v3

---
 [refs]          |  2 +-
 trunk/mm/rmap.c | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 5499801701a9..b60ed80cf770 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcf835e52e0974b2e2e056b190dd66372b28cfce
+refs/heads/master: 433abed6c6f76ca079a9564f2a1a51fd28ebe0ca
diff --git a/trunk/mm/rmap.c b/trunk/mm/rmap.c
index f6f0d2dda2ea..2854857fd63b 100644
--- a/trunk/mm/rmap.c
+++ b/trunk/mm/rmap.c
@@ -1564,13 +1564,14 @@ static void __hugepage_set_anon_rmap(struct page *page,
 	struct vm_area_struct *vma, unsigned long address, int exclusive)
 {
 	struct anon_vma *anon_vma = vma->anon_vma;
+
 	BUG_ON(!anon_vma);
-	if (!exclusive) {
-		struct anon_vma_chain *avc;
-		avc = list_entry(vma->anon_vma_chain.prev,
-				 struct anon_vma_chain, same_vma);
-		anon_vma = avc->anon_vma;
-	}
+
+	if (PageAnon(page))
+		return;
+	if (!exclusive)
+		anon_vma = anon_vma->root;
+
 	anon_vma = (void *) anon_vma + PAGE_MAPPING_ANON;
 	page->mapping = (struct address_space *) anon_vma;
 	page->index = linear_page_index(vma, address);