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 989e2e9af5c3adc42cb250409a4b7249288e0df7..aee0e1b0ebe7bf3bc97fcc9bcb6aabc902c10288 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -367,6 +367,11 @@ struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
        return find_vma(mm, addr);
 }
 
+int expand_stack(struct vm_area_struct *vma, unsigned long address)
+{
+       return -ENOMEM;
+}
+
 /*
  * look up the first VMA exactly that exactly matches addr
  * - should be called with mm->mmap_sem at least held readlocked
@@ -1336,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;