diff options
| author | Nick Piggin <npiggin@suse.de> | 2008-05-23 13:04:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-24 09:56:07 -0700 |
| commit | 42172d751b4596b8ca4346a1c251b5f1c661ab0c (patch) | |
| tree | f9149aee9349c43bd8e253b407acae920e041d00 /mm/memory.c | |
| parent | c2448278e3be3a43fe0343e138444742af1e99ae (diff) | |
| download | op-kernel-dev-42172d751b4596b8ca4346a1c251b5f1c661ab0c.zip op-kernel-dev-42172d751b4596b8ca4346a1c251b5f1c661ab0c.tar.gz | |
mm: allow pfnmap ->fault()s
Take out an assertion to allow ->fault handlers to service PFNMAP regions.
This is required to reimplement .nopfn handlers with .fault handlers and
subsequently remove nopfn.
Signed-off-by: Nick Piggin <npiggin@suse.de>
Acked-by: Jes Sorensen <jes@sgi.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/memory.c b/mm/memory.c index fb5608a..19e0ae9 100644 --- a/mm/memory.c +++ b/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; |
