From 2ba7b68aab84461a0a68428265a567721b7eafbe Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Wed, 27 Oct 2010 15:34:48 -0700 Subject: [PATCH] --- yaml --- r: 218617 b: refs/heads/master c: f49d2eb314f3f83270bef6aea2abb7a26d4218ee h: refs/heads/master i: 218615: f9c9dd1df1dd1c2a342027851b6255e5ed9043ca v: v3 --- [refs] | 2 +- trunk/arch/alpha/kernel/pci_iommu.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 21b0d08c072d..3f5a58f40a39 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1c7438dbbd03442ff86066843485db7fadd67bd +refs/heads/master: f49d2eb314f3f83270bef6aea2abb7a26d4218ee diff --git a/trunk/arch/alpha/kernel/pci_iommu.c b/trunk/arch/alpha/kernel/pci_iommu.c index d1dbd9acd1df..022c2748fa41 100644 --- a/trunk/arch/alpha/kernel/pci_iommu.c +++ b/trunk/arch/alpha/kernel/pci_iommu.c @@ -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;