From: Ingo Molnar Date: Fri, 29 Jan 2016 08:41:18 +0000 (+0100) Subject: Merge tag 'v4.5-rc1' into x86/asm, to refresh the branch before merging new changes X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=76b36fa896a2db64582690e085f36adc76604134;p=deliverable%2Flinux.git Merge tag 'v4.5-rc1' into x86/asm, to refresh the branch before merging new changes Signed-off-by: Ingo Molnar --- 76b36fa896a2db64582690e085f36adc76604134 diff --cc include/linux/mm.h index 87ef1d7730ba,f1cd22f2df1a..a7fef5958730 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@@ -2080,10 -2137,8 +2137,10 @@@ int remap_pfn_range(struct vm_area_stru 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, - unsigned long pfn); + pfn_t pfn); int vm_iomap_memory(struct vm_area_struct *vma, phys_addr_t start, unsigned long len); diff --cc mm/memory.c index a29f0b90fc56,30991f83d0bf..5aa4f55eb786 --- a/mm/memory.c +++ b/mm/memory.c @@@ -1608,10 -1574,10 +1595,10 @@@ int vm_insert_pfn_prot(struct vm_area_s return ret; } -EXPORT_SYMBOL(vm_insert_pfn); +EXPORT_SYMBOL(vm_insert_pfn_prot); int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr, - unsigned long pfn) + pfn_t pfn) { BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));