Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c13bb1d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Tony Luck
Browse files

ia64: remove CONFIG_SWIOTLB ifdefs 



CONFIG_SWIOTLB is now unconditionally selected on ia64, so remove the
ifdefs.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lkml.kernel.org/r/20190813072514.23299-28-hch@lst.de


Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent df41017e

arch/ia64/kernel/dma-mapping.c

+0 −2
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ int iommu_detected __read_mostly; 
const struct dma_map_ops *dma_ops;

EXPORT_SYMBOL(dma_ops);



#ifdef CONFIG_SWIOTLB

void *arch_dma_alloc(struct device *dev, size_t size,

		dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs)

{
@@ -26,4 +25,3 @@ long arch_dma_coherent_to_pfn(struct device *dev, void *cpu_addr, 
{

	return page_to_pfn(virt_to_page(cpu_addr));

}
 
#endif

arch/ia64/mm/init.c

+0 −2
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ __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
@@ -83,7 +82,6 @@ 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)