diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2010-10-27 18:34:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 21:03:17 -0400 |
commit | f49d2eb314f3f83270bef6aea2abb7a26d4218ee (patch) | |
tree | d2ab6ccf6c560909a4a83aaabdc81f821300014a /arch/alpha | |
parent | c1c7438dbbd03442ff86066843485db7fadd67bd (diff) |
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: FUJITA 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/alpha')
-rw-r--r-- | arch/alpha/kernel/pci_iommu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c index d1dbd9acd1df..022c2748fa41 100644 --- a/arch/alpha/kernel/pci_iommu.c +++ b/arch/alpha/kernel/pci_iommu.c | |||
@@ -223,7 +223,7 @@ iommu_arena_free(struct pci_iommu_arena *arena, long ofs, long n) | |||
223 | */ | 223 | */ |
224 | static int pci_dac_dma_supported(struct pci_dev *dev, u64 mask) | 224 | static int pci_dac_dma_supported(struct pci_dev *dev, u64 mask) |
225 | { | 225 | { |
226 | dma64_addr_t dac_offset = alpha_mv.pci_dac_offset; | 226 | dma_addr_t dac_offset = alpha_mv.pci_dac_offset; |
227 | int ok = 1; | 227 | int ok = 1; |
228 | 228 | ||
229 | /* If this is not set, the machine doesn't support DAC at all. */ | 229 | /* 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, | |||
756 | spin_lock_irqsave(&arena->lock, flags); | 756 | spin_lock_irqsave(&arena->lock, flags); |
757 | 757 | ||
758 | for (end = sg + nents; sg < end; ++sg) { | 758 | for (end = sg + nents; sg < end; ++sg) { |
759 | dma64_addr_t addr; | 759 | dma_addr_t addr; |
760 | size_t size; | 760 | size_t size; |
761 | long npages, ofs; | 761 | long npages, ofs; |
762 | dma_addr_t tend; | 762 | dma_addr_t tend; |