Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

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)
  */
 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;