The patch titled Subject: mm: remove references to vm_insert_pfn() has been added to the -mm tree. Its filename is mm-remove-references-to-vm_insert_pfn.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-remove-references-to-vm_insert_pfn.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-remove-references-to-vm_insert_pfn.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Matthew Wilcox <willy@xxxxxxxxxxxxx> Subject: mm: remove references to vm_insert_pfn() Documentation and comments. Link: http://lkml.kernel.org/r/20180828145728.11873-7-willy@xxxxxxxxxxxxx Signed-off-by: Matthew Wilcox <willy@xxxxxxxxxxxxx> Cc: Nicolas Pitre <nicolas.pitre@xxxxxxxxxx> Cc: Souptick Joarder <jrdr.linux@xxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/x86/pat.txt | 4 ++-- include/asm-generic/pgtable.h | 4 ++-- include/linux/hmm.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) --- a/Documentation/x86/pat.txt~mm-remove-references-to-vm_insert_pfn +++ a/Documentation/x86/pat.txt @@ -90,12 +90,12 @@ pci proc | -- | - Advanced APIs for drivers ------------------------- A. Exporting pages to users with remap_pfn_range, io_remap_pfn_range, -vm_insert_pfn +vmf_insert_pfn Drivers wanting to export some pages to userspace do it by using mmap interface and a combination of 1) pgprot_noncached() -2) io_remap_pfn_range() or remap_pfn_range() or vm_insert_pfn() +2) io_remap_pfn_range() or remap_pfn_range() or vmf_insert_pfn() With PAT support, a new API pgprot_writecombine is being added. So, drivers can continue to use the above sequence, with either pgprot_noncached() or --- a/include/asm-generic/pgtable.h~mm-remove-references-to-vm_insert_pfn +++ a/include/asm-generic/pgtable.h @@ -757,7 +757,7 @@ static inline pmd_t pmd_swp_clear_soft_d /* * Interfaces that can be used by architecture code to keep track of * memory type of pfn mappings specified by the remap_pfn_range, - * vm_insert_pfn. + * vmf_insert_pfn. */ /* @@ -773,7 +773,7 @@ static inline int track_pfn_remap(struct /* * track_pfn_insert is called when a _new_ single pfn is established - * by vm_insert_pfn(). + * by vmf_insert_pfn(). */ static inline void track_pfn_insert(struct vm_area_struct *vma, pgprot_t *prot, pfn_t pfn) --- a/include/linux/hmm.h~mm-remove-references-to-vm_insert_pfn +++ a/include/linux/hmm.h @@ -107,7 +107,7 @@ enum hmm_pfn_flag_e { * HMM_PFN_ERROR: corresponding CPU page table entry points to poisoned memory * HMM_PFN_NONE: corresponding CPU page table entry is pte_none() * HMM_PFN_SPECIAL: corresponding CPU page table entry is special; i.e., the - * result of vm_insert_pfn() or vm_insert_page(). Therefore, it should not + * result of vmf_insert_pfn() or vm_insert_page(). Therefore, it should not * be mirrored by a device, because the entry will never have HMM_PFN_VALID * set and the pfn value is undefined. * _ Patches currently in -mm which might be from willy@xxxxxxxxxxxxx are cramfs-convert-to-use-vmf_insert_mixed.patch mm-remove-vm_insert_mixed.patch mm-introduce-vmf_insert_pfn_prot.patch x86-convert-vdso-to-use-vm_fault_t.patch mm-make-vm_insert_pfn_prot-static.patch mm-remove-references-to-vm_insert_pfn.patch mm-remove-vm_insert_pfn.patch mm-inline-vm_insert_pfn_prot-into-caller.patch mm-convert-__vm_insert_mixed-to-vm_fault_t.patch mm-convert-insert_pfn-to-vm_fault_t.patch