mm: merge populate and nopage into fault (fixes nonlinear)

[mirror_ubuntu-zesty-kernel.git] / mm / nommu.c

diff --git a/mm/nommu.c b/mm/nommu.c
index 8bbbf147a79421fd59d5c616266a74b5142232e6..aee0e1b0ebe7bf3bc97fcc9bcb6aabc902c10288 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1341,8 +1341,7 @@ int in_gate_area_no_task(unsigned long addr)
        return 0;
 }
 
-struct page *filemap_nopage(struct vm_area_struct *area,
-                       unsigned long address, int *type)
+struct page *filemap_fault(struct vm_area_struct *vma, struct fault_data *fdata)
 {
        BUG();
        return NULL;