Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f49d2eb314f3f83270bef6aea2abb7a26d4218ee

Authored by FUJITA Tomonori
Committed by Linus Torvalds
1 parent c1c7438dbb
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

arch/alpha/kernel/pci_iommu.c
Diff comments   View file @ f49d2eb
... ... @@ -223,7 +223,7 @@
223 223 */
224 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 227 int ok = 1;
228 228  
229 229 /* If this is not set, the machine doesn't support DAC at all. */
... ... @@ -756,7 +756,7 @@
756 756 spin_lock_irqsave(&arena->lock, flags);
757 757  
758 758 for (end = sg + nents; sg < end; ++sg) {
759   - dma64_addr_t addr;
  759 + dma_addr_t addr;
760 760 size_t size;
761 761 long npages, ofs;
762 762 dma_addr_t tend;