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

Commit f49d2eb3 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Linus Torvalds
Browse files

alpha: remove dma64_addr_t usage 



dma_addr_t is always 64 bit on alpha. So let's use dma_addr_t instead.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c1c7438d

arch/alpha/kernel/pci_iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ iommu_arena_free(struct pci_iommu_arena *arena, long ofs, long n) 
 */

static int pci_dac_dma_supported(struct pci_dev *dev, u64 mask)

{

	dma64_addr_t dac_offset = alpha_mv.pci_dac_offset;

	dma_addr_t dac_offset = alpha_mv.pci_dac_offset;

	int ok = 1;



	/* If this is not set, the machine doesn't support DAC at all.  */
@@ -756,7 +756,7 @@ static void alpha_pci_unmap_sg(struct device *dev, struct scatterlist *sg, 
	spin_lock_irqsave(&arena->lock, flags);



	for (end = sg + nents; sg < end; ++sg) {

		dma64_addr_t addr;

		dma_addr_t addr;

		size_t size;

		long npages, ofs;

		dma_addr_t tend;