diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-07-04 07:40:05 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-07-04 07:40:05 -0700 |
| commit | fdcc205fb9ba006bcd37f72e1b1b904704257351 (patch) | |
| tree | a1ee747bcb9c5973e95dfb6bcd37429971223af2 /arch/arm/plat-omap/iovmm.c | |
| parent | be741de16f1148ecf0fcdd1f438945c939e6ea38 (diff) | |
| parent | fee17d4fdf70050e84fab3eb9d8eeb8d1daad242 (diff) | |
| download | blackbird-op-linux-fdcc205fb9ba006bcd37f72e1b1b904704257351.tar.gz blackbird-op-linux-fdcc205fb9ba006bcd37f72e1b1b904704257351.zip | |
Merge branch 'iommu-for-tony' of git://github.com/ohadbc/omap-iommu into devel-fixes
Diffstat (limited to 'arch/arm/plat-omap/iovmm.c')
| -rw-r--r-- | arch/arm/plat-omap/iovmm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/iovmm.c b/arch/arm/plat-omap/iovmm.c index 83a37c54342f..c60737c49a32 100644 --- a/arch/arm/plat-omap/iovmm.c +++ b/arch/arm/plat-omap/iovmm.c @@ -72,7 +72,7 @@ static size_t sgtable_len(const struct sg_table *sgt) 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 @@ static void *vmap_sg(const struct sg_table *sgt) int err; pa = sg_phys(sg); - bytes = sg_dma_len(sg); + bytes = sg->length; BUG_ON(bytes != PAGE_SIZE); @@ -476,7 +476,7 @@ static int map_iovm_area(struct iommu *obj, struct iovm_struct *new, 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); |
