There are no more users of MEMORY_DEVICE_PCI_P2PDMA and is_pci_p2pdma_page(), so remove them. Signed-off-by: Logan Gunthorpe <logang@xxxxxxxxxxxx> --- include/linux/memremap.h | 5 ----- include/linux/mm.h | 13 ------------- 2 files changed, 18 deletions(-) diff --git a/include/linux/memremap.h b/include/linux/memremap.h index 1732dea030b2..2e5d9fcd4d69 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -51,16 +51,11 @@ struct vmem_altmap { * wakeup event whenever a page is unpinned and becomes idle. This * wakeup is used to coordinate physical address space management (ex: * fs truncate/hole punch) vs pinned pages (ex: device dma). - * - * MEMORY_DEVICE_PCI_P2PDMA: - * Device memory residing in a PCI BAR intended for use with Peer-to-Peer - * transactions. */ enum memory_type { MEMORY_DEVICE_PRIVATE = 1, MEMORY_DEVICE_PUBLIC, MEMORY_DEVICE_FS_DAX, - MEMORY_DEVICE_PCI_P2PDMA, }; /* diff --git a/include/linux/mm.h b/include/linux/mm.h index dd0b5f4e1e45..f5fa9ec440e3 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -966,19 +966,6 @@ static inline bool is_device_public_page(const struct page *page) page->pgmap->type == MEMORY_DEVICE_PUBLIC; } -#ifdef CONFIG_PCI_P2PDMA -static inline bool is_pci_p2pdma_page(const struct page *page) -{ - return is_zone_device_page(page) && - page->pgmap->type == MEMORY_DEVICE_PCI_P2PDMA; -} -#else /* CONFIG_PCI_P2PDMA */ -static inline bool is_pci_p2pdma_page(const struct page *page) -{ - return false; -} -#endif /* CONFIG_PCI_P2PDMA */ - #else /* CONFIG_DEV_PAGEMAP_OPS */ static inline void dev_pagemap_get_ops(void) { -- 2.20.1