Merge branch 'akpm' (patches from Andrew)

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

diff --git a/mm/memory.c b/mm/memory.c
index 988d3099a25d0c22eef4e529963da593f636cb5b..d63849b5188fe73152067c86998b3984e589274f 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -754,6 +754,8 @@ struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr,
        if (HAVE_PTE_SPECIAL) {
                if (likely(!pte_special(pte)))
                        goto check_pfn;
+               if (vma->vm_ops && vma->vm_ops->find_special_page)
+                       return vma->vm_ops->find_special_page(vma, addr);
                if (vma->vm_flags & (VM_PFNMAP | VM_MIXEDMAP))
                        return NULL;
                if (!is_zero_pfn(pfn))