ia64: fix compile without swiotlb
From: Christoph Hellwig <[email protected]>
Some non-generic ia64 configs don't build swiotlb, and thus should not pull in the generic non-coherent DMA infrastructure.
Fixes 68c608345c ("swiotlb: remove dma_mark_clean")
Reported-by Tony Luck <[email protected]>
Signed-off-by Christoph Hellwig <[email protected]>
Signed-off-by Tony Luck <[email protected]>
--- arch/ia64/Kconfig | 2 +- arch/ia64/mm/init.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
arch/ia64/Kconfig +1 -1
@@ -31,7 +31,7 @@ config IA64 select HAVE_MEMBLOCK_NODE_MAP select HAVE_VIRT_CPU_ACCOUNTING select ARCH_HAS_DMA_COHERENT_TO_PFN if SWIOTLB - select ARCH_HAS_SYNC_DMA_FOR_CPU + select ARCH_HAS_SYNC_DMA_FOR_CPU if SWIOTLB select VIRT_TO_BUS select ARCH_DISCARD_MEMBLOCK select GENERIC_IRQ_PROBE
arch/ia64/mm/init.c +2 -0
@@ -67,6 +67,7 @@ __ia64_sync_icache_dcache (pte_t pte)set_bit (PG_arch_1, &page->flags);/* mark page as clean */ } +#ifdef CONFIG_SWIOTLB /* * Since DMA is i-cache coherent, any (complete) pages that were written via * DMA can be marked as "clean" so that lazy_mmu_prot_update() doesn't have to
@@ -81,6 +82,7 @@ void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr, set_bit(PG_arch_1, &pfn_to_page(pfn)->flags); }while (++pfn <=PHYS_PFN (paddr + size -1 )); } +#endif inline void ia64_set_rbs_bot (void )
Signature · 1 line
2.19.1