From: Nick Piggin Fix a couple of places that should be testing fault as well as nopage. Signed-off-by: Nick Piggin Cc: Rusty Russell Signed-off-by: Andrew Morton --- mm/memory.c | 3 ++- mm/rmap.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff -puN mm/memory.c~mm-merge-populate-and-nopage-into-fault-fixes-nonlinear-fix mm/memory.c --- a/mm/memory.c~mm-merge-populate-and-nopage-into-fault-fixes-nonlinear-fix +++ a/mm/memory.c @@ -1077,7 +1077,8 @@ int get_user_pages(struct task_struct *t if (pages) foll_flags |= FOLL_GET; if (!write && !(vma->vm_flags & VM_LOCKED) && - (!vma->vm_ops || !vma->vm_ops->nopage)) + (!vma->vm_ops || (!vma->vm_ops->nopage && + !vma->vm_ops->fault))) foll_flags |= FOLL_ANON; do { diff -puN mm/rmap.c~mm-merge-populate-and-nopage-into-fault-fixes-nonlinear-fix mm/rmap.c --- a/mm/rmap.c~mm-merge-populate-and-nopage-into-fault-fixes-nonlinear-fix +++ a/mm/rmap.c @@ -641,8 +641,10 @@ void page_remove_rmap(struct page *page, printk (KERN_EMERG " page->count = %x\n", page_count(page)); printk (KERN_EMERG " page->mapping = %p\n", page->mapping); print_symbol (KERN_EMERG " vma->vm_ops = %s\n", (unsigned long)vma->vm_ops); - if (vma->vm_ops) + if (vma->vm_ops) { print_symbol (KERN_EMERG " vma->vm_ops->nopage = %s\n", (unsigned long)vma->vm_ops->nopage); + print_symbol (KERN_EMERG " vma->vm_ops->fault = %s\n", (unsigned long)vma->vm_ops->fault); + } if (vma->vm_file && vma->vm_file->f_op) print_symbol (KERN_EMERG " vma->vm_file->f_op->mmap = %s\n", (unsigned long)vma->vm_file->f_op->mmap); BUG(); _