summaryrefslogtreecommitdiffstats
path: root/drivers/iommu
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-04-02 14:34:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-02 14:34:25 -0700
commit7474043eff6f7c20141b2f49f774d0aab6542220 (patch)
treef143f787c7ff3ee6c8fede1bd2fd60c36b328243 /drivers/iommu
parentb9f2b21a32906a47c220b5167b88869f2c90f1c4 (diff)
parent68efd7d2fb32c2606f1da318b6a851d933813f27 (diff)
downloadlinux-7474043eff6f7c20141b2f49f774d0aab6542220.tar.bz2
Merge branch 'for-3.15' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull DMA-mapping updates from Marek Szyprowski: "This contains extension for more efficient handling of io address space for dma-mapping subsystem for ARM architecture" * 'for-3.15' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping: arm: dma-mapping: remove order parameter from arm_iommu_create_mapping() arm: dma-mapping: Add support to extend DMA IOMMU mappings
Diffstat (limited to 'drivers/iommu')
-rw-r--r--drivers/iommu/shmobile-iommu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/shmobile-iommu.c b/drivers/iommu/shmobile-iommu.c
index 7a3b928fad1c..464acda0bbc4 100644
--- a/drivers/iommu/shmobile-iommu.c
+++ b/drivers/iommu/shmobile-iommu.c
@@ -343,7 +343,7 @@ static int shmobile_iommu_add_device(struct device *dev)
mapping = archdata->iommu_mapping;
if (!mapping) {
mapping = arm_iommu_create_mapping(&platform_bus_type, 0,
- L1_LEN << 20, 0);
+ L1_LEN << 20);
if (IS_ERR(mapping))
return PTR_ERR(mapping);
archdata->iommu_mapping = mapping;