3 files changed, 6 insertions, 19 deletions

diff --git a/mm/memory.c b/mm/memory.c
index 0d14d1e58a5f..46958fb97c2d 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1057,8 +1057,7 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
                 if (pages)
                         foll_flags |= FOLL_GET;
                 if (!write && !(vma->vm_flags & VM_LOCKED) &&
-                    (!vma->vm_ops || (!vma->vm_ops->nopage &&
-                                        !vma->vm_ops->fault)))
+                    (!vma->vm_ops || !vma->vm_ops->fault))
                         foll_flags |= FOLL_ANON;
 
                 do {
@@ -2199,20 +2198,9 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
 
         BUG_ON(vma->vm_flags & VM_PFNMAP);
 
-        if (likely(vma->vm_ops->fault)) {
-                ret = vma->vm_ops->fault(vma, &vmf);
-                if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE)))
-                        return ret;
-        } else {
-                /* Legacy ->nopage path */
-                ret = 0;
-                vmf.page = vma->vm_ops->nopage(vma, address & PAGE_MASK, &ret);
-                /* no page was available -- either SIGBUS or OOM */
-                if (unlikely(vmf.page == NOPAGE_SIGBUS))
-                        return VM_FAULT_SIGBUS;
-                else if (unlikely(vmf.page == NOPAGE_OOM))
-                        return VM_FAULT_OOM;
-        }
+        ret = vma->vm_ops->fault(vma, &vmf);
+        if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE)))
+                return ret;
 
         /*
          * For consistency in subsequent calls, make the faulted page always
@@ -2458,7 +2446,7 @@ static inline int handle_pte_fault(struct mm_struct *mm,
         if (!pte_present(entry)) {
                 if (pte_none(entry)) {
                         if (vma->vm_ops) {
-                                if (vma->vm_ops->fault || vma->vm_ops->nopage)
+                                if (likely(vma->vm_ops->fault))
                                         return do_linear_fault(mm, vma, address,
                                                 pte, pmd, write_access, entry);
                                 if (unlikely(vma->vm_ops->nopfn))
diff --git a/mm/mincore.c b/mm/mincore.c
index 5efe0ded69b1..5178800bc129 100644
--- a/mm/mincore.c
+++ b/mm/mincore.c
@@ -33,7 +33,7 @@ static unsigned char mincore_page(struct address_space *mapping, pgoff_t pgoff)
          * When tmpfs swaps out a page from a file, any process mapping that
          * file will not get a swp_entry_t in its pte, but rather it is like
          * any other file mapping (ie. marked !present and faulted in with
-         * tmpfs's .nopage). So swapped out tmpfs mappings are tested here.
+         * tmpfs's .fault). So swapped out tmpfs mappings are tested here.
          *
          * However when tmpfs moves the page from pagecache and into swapcache,
          * it is still in core, but the find_get_page below won't find it.
diff --git a/mm/rmap.c b/mm/rmap.c
index e9bb6b1093f6..bf0a5b7cfb8e 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -662,7 +662,6 @@ void page_remove_rmap(struct page *page, struct vm_area_struct *vma)
                         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) {
-                                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)