diff options
author | Tony Lindgren <tony@atomide.com> | 2011-06-14 12:53:42 (GMT) |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-06-14 12:53:42 (GMT) |
commit | b8ce9fb8e18af7466e0b915bb5979322cdace322 (patch) | |
tree | eec6f9b58ce154fd863f0f78b374a697a5a7139b /arch/arm/plat-omap/iovmm.c | |
parent | c8e0bf95fc01d6e2ca585fe08010800b6c56e823 (diff) | |
parent | e9e35c5a2b2c803b5e2f25906d8ffe110670ceb6 (diff) | |
download | linux-fsl-qoriq-b8ce9fb8e18af7466e0b915bb5979322cdace322.tar.xz |
Merge branch 'fixes-v3.0-rc3' into devel-fixes
Diffstat (limited to 'arch/arm/plat-omap/iovmm.c')
-rw-r--r-- | arch/arm/plat-omap/iovmm.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/iovmm.c b/arch/arm/plat-omap/iovmm.c index 51ef43e..83a37c5 100644 --- a/arch/arm/plat-omap/iovmm.c +++ b/arch/arm/plat-omap/iovmm.c @@ -648,7 +648,6 @@ u32 iommu_vmap(struct iommu *obj, u32 da, const struct sg_table *sgt, return PTR_ERR(va); } - flags &= IOVMF_HW_MASK; flags |= IOVMF_DISCONT; flags |= IOVMF_MMIO; @@ -706,7 +705,6 @@ u32 iommu_vmalloc(struct iommu *obj, u32 da, size_t bytes, u32 flags) if (!va) return -ENOMEM; - flags &= IOVMF_HW_MASK; flags |= IOVMF_DISCONT; flags |= IOVMF_ALLOC; @@ -795,7 +793,6 @@ u32 iommu_kmap(struct iommu *obj, u32 da, u32 pa, size_t bytes, if (!va) return -ENOMEM; - flags &= IOVMF_HW_MASK; flags |= IOVMF_LINEAR; flags |= IOVMF_MMIO; @@ -853,7 +850,6 @@ u32 iommu_kmalloc(struct iommu *obj, u32 da, size_t bytes, u32 flags) return -ENOMEM; pa = virt_to_phys(va); - flags &= IOVMF_HW_MASK; flags |= IOVMF_LINEAR; flags |= IOVMF_ALLOC; |