The patch titled Subject: mm-dax-pmem-introduce-pfn_t-v3 has been added to the -mm tree. Its filename is mm-dax-pmem-introduce-pfn_t-v3.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-dax-pmem-introduce-pfn_t-v3.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-dax-pmem-introduce-pfn_t-v3.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/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Dan Williams <dan.j.williams@xxxxxxxxx> Subject: mm-dax-pmem-introduce-pfn_t-v3 Moved phys_to_pfn_t() out of line so it can be overridden for new unit tests in development. Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx> Cc: Christoph Hellwig <hch@xxxxxx> Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx> Cc: Ross Zwisler <ross.zwisler@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/mm.h | 5 +---- kernel/memremap.c | 6 ++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff -puN include/linux/mm.h~mm-dax-pmem-introduce-pfn_t-v3 include/linux/mm.h --- a/include/linux/mm.h~mm-dax-pmem-introduce-pfn_t-v3 +++ a/include/linux/mm.h @@ -922,10 +922,7 @@ static inline pfn_t pfn_to_pfn_t(unsigne return __pfn_to_pfn_t(pfn, 0); } -static inline pfn_t phys_to_pfn_t(dma_addr_t addr, unsigned long flags) -{ - return __pfn_to_pfn_t(addr >> PAGE_SHIFT, flags); -} +extern pfn_t phys_to_pfn_t(dma_addr_t addr, unsigned long flags); static inline bool pfn_t_has_page(pfn_t pfn) { diff -puN kernel/memremap.c~mm-dax-pmem-introduce-pfn_t-v3 kernel/memremap.c --- a/kernel/memremap.c~mm-dax-pmem-introduce-pfn_t-v3 +++ a/kernel/memremap.c @@ -147,6 +147,12 @@ void devm_memunmap(struct device *dev, v } EXPORT_SYMBOL(devm_memunmap); +pfn_t phys_to_pfn_t(dma_addr_t addr, unsigned long flags) +{ + return __pfn_to_pfn_t(addr >> PAGE_SHIFT, flags); +} +EXPORT_SYMBOL(phys_to_pfn_t); + #ifdef CONFIG_ZONE_DEVICE struct page_map { struct resource res; _ Patches currently in -mm which might be from dan.j.williams@xxxxxxxxx are scatterlist-fix-sg_phys-masking.patch pmem-dax-clean-up-clear_pmem.patch dax-increase-granularity-of-dax_clear_blocks-operations.patch dax-guarantee-page-aligned-results-from-bdev_direct_access.patch dax-fix-lifetime-of-in-kernel-dax-mappings-with-dax_map_atomic.patch dax-fix-lifetime-of-in-kernel-dax-mappings-with-dax_map_atomic-v3.patch um-kill-pfn_t.patch kvm-rename-pfn_t-to-kvm_pfn_t.patch mm-dax-pmem-introduce-pfn_t.patch mm-dax-pmem-introduce-pfn_t-v3.patch mm-introduce-find_dev_pagemap.patch x86-mm-introduce-vmem_altmap-to-augment-vmemmap_populate.patch libnvdimm-pfn-pmem-allocate-memmap-array-in-persistent-memory.patch avr32-convert-to-asm-generic-memory_modelh.patch hugetlb-fix-compile-error-on-tile.patch frv-fix-compiler-warning-from-definition-of-__pmd.patch x86-mm-introduce-_page_devmap.patch mm-dax-gpu-convert-vm_insert_mixed-to-pfn_t.patch mm-dax-convert-vmf_insert_pfn_pmd-to-pfn_t.patch list-introduce-list_del_poison.patch libnvdimm-pmem-move-request_queue-allocation-earlier-in-probe.patch mm-dax-pmem-introduce-getput_dev_pagemap-for-dax-gup.patch mm-dax-dax-pmd-vs-thp-pmd-vs-hugetlbfs-pmd.patch mm-x86-get_user_pages-for-dax-mappings.patch dax-provide-diagnostics-for-pmd-mapping-failures.patch dax-re-enable-dax-pmd-mappings.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html