From 0878d9a3b8e38d4d3fad2590a7584a314788e7c7 Mon Sep 17 00:00:00 2001
From: Andrea Arcangeli <aarcange@redhat.com>
Date: Mon, 9 Aug 2010 17:19:10 -0700
Subject: [PATCH] --- yaml --- r: 207236 b: refs/heads/master c:
 21d0d443cdc1658a8c1484fdcece4803f0f96d0e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1e481a618802..58fa3eab93f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 288468c334e98aacbb7e2fb8bde6bc1adcd55e05
+refs/heads/master: 21d0d443cdc1658a8c1484fdcece4803f0f96d0e
diff --git a/trunk/mm/rmap.c b/trunk/mm/rmap.c
index f5d6799b8a74..2f855babfd06 100644
--- a/trunk/mm/rmap.c
+++ b/trunk/mm/rmap.c
@@ -364,9 +364,10 @@ vma_address(struct page *page, struct vm_area_struct *vma)
  */
 unsigned long page_address_in_vma(struct page *page, struct vm_area_struct *vma)
 {
-	if (PageAnon(page))
-		;
-	else if (page->mapping && !(vma->vm_flags & VM_NONLINEAR)) {
+	if (PageAnon(page)) {
+		if (vma->anon_vma->root != page_anon_vma(page)->root)
+			return -EFAULT;
+	} else if (page->mapping && !(vma->vm_flags & VM_NONLINEAR)) {
 		if (!vma->vm_file ||
 		    vma->vm_file->f_mapping != page->mapping)
 			return -EFAULT;