Merge tag 'v4.5-rc1' into x86/asm, to refresh the branch before merging new changes

[mirror_ubuntu-zesty-kernel.git] / include / linux / mm.h

diff --git a/include/linux/mm.h b/include/linux/mm.h
index f1cd22f2df1ac50438e7d70bb0df85c44580b8d3..a7fef5958730ef49798df55d16cc544c38ec4178 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2137,6 +2137,8 @@ int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
 int vm_insert_page(struct vm_area_struct *, unsigned long addr, struct page *);
 int vm_insert_pfn(struct vm_area_struct *vma, unsigned long addr,
                        unsigned long pfn);
+int vm_insert_pfn_prot(struct vm_area_struct *vma, unsigned long addr,
+                       unsigned long pfn, pgprot_t pgprot);
 int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
                        pfn_t pfn);
 int vm_iomap_memory(struct vm_area_struct *vma, phys_addr_t start, unsigned long len);