From 3fa96b9d14f8620d7afb6eedf787c22cb99ce3f5 Mon Sep 17 00:00:00 2001
From: Nick Piggin <npiggin@suse.de>
Date: Fri, 23 May 2008 13:04:18 -0700
Subject: [PATCH] --- yaml --- r: 97235 b: refs/heads/master c:
 42172d751b4596b8ca4346a1c251b5f1c661ab0c h: refs/heads/master i:   97233:
 451a357f83734a613a6b8d93ac65923f86ba3049   97231:
 b83f93a72537b33e1c9ec8a43332b57f184c5cda v: v3

---
 [refs]            | 2 +-
 trunk/mm/memory.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 14b99065d483..9f08b10e9e11 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2448278e3be3a43fe0343e138444742af1e99ae
+refs/heads/master: 42172d751b4596b8ca4346a1c251b5f1c661ab0c
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
index fb5608a120ed..19e0ae9beecb 100644
--- a/trunk/mm/memory.c
+++ b/trunk/mm/memory.c
@@ -2295,8 +2295,6 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
 	vmf.flags = flags;
 	vmf.page = NULL;
 
-	BUG_ON(vma->vm_flags & VM_PFNMAP);
-
 	ret = vma->vm_ops->fault(vma, &vmf);
 	if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE)))
 		return ret;