Merge branch 'iommu-for-tony' of git://github.com/ohadbc/omap-iommu into devel-fixes

diff --combined arch/arm/plat-omap/iovmm.c
index 83a37c54342f414573d942c2c28f5bb9459b4ec7,a459628135218a8b3ec7e74229606584d89dc7b3..c60737c49a32fae14b445ce938c59975998d7ae4
--- 1/arch/arm/plat-omap/iovmm.c
--- 2/arch/arm/plat-omap/iovmm.c
+++ b/arch/arm/plat-omap/iovmm.c
@@@ -72,7 -72,7 +72,7 @@@ static size_t sgtable_len(const struct 
        for_each_sg(sgt->sgl, sg, sgt->nents, i) {
                size_t bytes;
  
-               bytes = sg_dma_len(sg);
+               bytes = sg->length;
  
                if (!iopgsz_ok(bytes)) {
                        pr_err("%s: sg[%d] not iommu pagesize(%x)\n",
@@@ -198,7 -198,7 +198,7 @@@ static void *vmap_sg(const struct sg_ta
                int err;
  
                pa = sg_phys(sg);
-               bytes = sg_dma_len(sg);
+               bytes = sg->length;
  
                BUG_ON(bytes != PAGE_SIZE);
  
@@@ -476,7 -476,7 +476,7 @@@ static int map_iovm_area(struct iommu *
                struct iotlb_entry e;
  
                pa = sg_phys(sg);
-               bytes = sg_dma_len(sg);
+               bytes = sg->length;
  
                flags &= ~IOVMF_PGSZ_MASK;
                pgsz = bytes_to_iopgsz(bytes);
@@@ -648,6 -648,7 +648,6 @@@ u32 iommu_vmap(struct iommu *obj, u32 d
                        return PTR_ERR(va);
        }
  
 -      flags &= IOVMF_HW_MASK;
        flags |= IOVMF_DISCONT;
        flags |= IOVMF_MMIO;
  
@@@ -705,6 -706,7 +705,6 @@@ u32 iommu_vmalloc(struct iommu *obj, u3
        if (!va)
                return -ENOMEM;
  
 -      flags &= IOVMF_HW_MASK;
        flags |= IOVMF_DISCONT;
        flags |= IOVMF_ALLOC;
  
@@@ -793,6 -795,7 +793,6 @@@ u32 iommu_kmap(struct iommu *obj, u32 d
        if (!va)
                return -ENOMEM;
  
 -      flags &= IOVMF_HW_MASK;
        flags |= IOVMF_LINEAR;
        flags |= IOVMF_MMIO;
  
@@@ -850,6 -853,7 +850,6 @@@ u32 iommu_kmalloc(struct iommu *obj, u3
                return -ENOMEM;
        pa = virt_to_phys(va);
  
 -      flags &= IOVMF_HW_MASK;
        flags |= IOVMF_LINEAR;
        flags |= IOVMF_ALLOC;