15 files changed, 42 insertions, 8 deletions

diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c
index 242108439f42..7f1925a32c99 100644
--- a/arch/alpha/kernel/pci_iommu.c
+++ b/arch/alpha/kernel/pci_iommu.c
@@ -955,5 +955,7 @@ const struct dma_map_ops alpha_pci_ops = {
         .map_sg                 = alpha_pci_map_sg,
         .unmap_sg               = alpha_pci_unmap_sg,
         .dma_supported          = alpha_pci_supported,
+        .mmap                   = dma_common_mmap,
+        .get_sgtable            = dma_common_get_sgtable,
 };
 EXPORT_SYMBOL(alpha_pci_ops);
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index 3d24cc43385b..4c0ea6c2833d 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -2183,6 +2183,8 @@ const struct dma_map_ops sba_dma_ops = {
         .map_sg                 = sba_map_sg_attrs,
         .unmap_sg               = sba_unmap_sg_attrs,
         .dma_supported          = sba_dma_supported,
+        .mmap                   = dma_common_mmap,
+        .get_sgtable            = dma_common_get_sgtable,
 };
 
 void sba_dma_init(void)
diff --git a/arch/ia64/sn/pci/pci_dma.c b/arch/ia64/sn/pci/pci_dma.c
index b7d42e4edc1f..12ffb9c0d738 100644
--- a/arch/ia64/sn/pci/pci_dma.c
+++ b/arch/ia64/sn/pci/pci_dma.c
@@ -438,6 +438,8 @@ static struct dma_map_ops sn_dma_ops = {
         .unmap_sg               = sn_dma_unmap_sg,
         .dma_supported          = sn_dma_supported,
         .get_required_mask      = sn_dma_get_required_mask,
+        .mmap                   = dma_common_mmap,
+        .get_sgtable            = dma_common_get_sgtable,
 };
 
 void sn_dma_init(void)
diff --git a/arch/mips/jazz/jazzdma.c b/arch/mips/jazz/jazzdma.c
index 1804dc9d8136..a01e14955187 100644
--- a/arch/mips/jazz/jazzdma.c
+++ b/arch/mips/jazz/jazzdma.c
@@ -682,5 +682,7 @@ const struct dma_map_ops jazz_dma_ops = {
         .sync_sg_for_device     = jazz_dma_sync_sg_for_device,
         .dma_supported          = dma_direct_supported,
         .cache_sync             = arch_dma_cache_sync,
+        .mmap                   = dma_common_mmap,
+        .get_sgtable            = dma_common_get_sgtable,
 };
 EXPORT_SYMBOL(jazz_dma_ops);
diff --git a/arch/powerpc/kernel/dma-iommu.c b/arch/powerpc/kernel/dma-iommu.c
index a0879674a9c8..2f5a53874f6d 100644
--- a/arch/powerpc/kernel/dma-iommu.c
+++ b/arch/powerpc/kernel/dma-iommu.c
@@ -208,4 +208,6 @@ const struct dma_map_ops dma_iommu_ops = {
         .sync_single_for_device = dma_iommu_sync_for_device,
         .sync_sg_for_cpu        = dma_iommu_sync_sg_for_cpu,
         .sync_sg_for_device     = dma_iommu_sync_sg_for_device,
+        .mmap                   = dma_common_mmap,
+        .get_sgtable            = dma_common_get_sgtable,
 };
diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c
index 98410119c47b..70fcc9736a8c 100644
--- a/arch/powerpc/platforms/ps3/system-bus.c
+++ b/arch/powerpc/platforms/ps3/system-bus.c
@@ -700,6 +700,8 @@ static const struct dma_map_ops ps3_sb_dma_ops = {
         .get_required_mask = ps3_dma_get_required_mask,
         .map_page = ps3_sb_map_page,
         .unmap_page = ps3_unmap_page,
+        .mmap = dma_common_mmap,
+        .get_sgtable = dma_common_get_sgtable,
 };
 
 static const struct dma_map_ops ps3_ioc0_dma_ops = {
@@ -711,6 +713,8 @@ static const struct dma_map_ops ps3_ioc0_dma_ops = {
         .get_required_mask = ps3_dma_get_required_mask,
         .map_page = ps3_ioc0_map_page,
         .unmap_page = ps3_unmap_page,
+        .mmap = dma_common_mmap,
+        .get_sgtable = dma_common_get_sgtable,
 };
 
 /**
diff --git a/arch/powerpc/platforms/pseries/vio.c b/arch/powerpc/platforms/pseries/vio.c
index 6601b9d404dc..3473eef7628c 100644
--- a/arch/powerpc/platforms/pseries/vio.c
+++ b/arch/powerpc/platforms/pseries/vio.c
@@ -605,6 +605,8 @@ static const struct dma_map_ops vio_dma_mapping_ops = {
         .unmap_page        = vio_dma_iommu_unmap_page,
         .dma_supported     = dma_iommu_dma_supported,
         .get_required_mask = dma_iommu_get_required_mask,
+        .mmap              = dma_common_mmap,
+        .get_sgtable       = dma_common_get_sgtable,
 };
 
 /**
diff --git a/arch/s390/pci/pci_dma.c b/arch/s390/pci/pci_dma.c
index 9e52d1527f71..03d8c1c9f82f 100644
--- a/arch/s390/pci/pci_dma.c
+++ b/arch/s390/pci/pci_dma.c
@@ -668,6 +668,8 @@ const struct dma_map_ops s390_pci_dma_ops = {
         .unmap_sg       = s390_dma_unmap_sg,
         .map_page       = s390_dma_map_pages,
         .unmap_page     = s390_dma_unmap_pages,
+        .mmap           = dma_common_mmap,
+        .get_sgtable    = dma_common_get_sgtable,
         /* dma_supported is unconditionally true without a callback */
 };
 EXPORT_SYMBOL_GPL(s390_pci_dma_ops);
diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c
index a585ea6f686a..f72c487d68a8 100644
--- a/arch/x86/kernel/amd_gart_64.c
+++ b/arch/x86/kernel/amd_gart_64.c
@@ -677,6 +677,8 @@ static const struct dma_map_ops gart_dma_ops = {
         .unmap_page                     = gart_unmap_page,
         .alloc                          = gart_alloc_coherent,
         .free                           = gart_free_coherent,
+        .mmap                           = dma_common_mmap,
+        .get_sgtable                    = dma_common_get_sgtable,
         .dma_supported                  = dma_direct_supported,
 };
 
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
index 9d4343aa481b..23fdec030c37 100644
--- a/arch/x86/kernel/pci-calgary_64.c
+++ b/arch/x86/kernel/pci-calgary_64.c
@@ -468,6 +468,8 @@ static const struct dma_map_ops calgary_dma_ops = {
         .map_page = calgary_map_page,
         .unmap_page = calgary_unmap_page,
         .dma_supported = dma_direct_supported,
+        .mmap = dma_common_mmap,
+        .get_sgtable = dma_common_get_sgtable,
 };
 
 static inline void __iomem * busno_to_bbar(unsigned char num)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index b607a92791d3..2e74ad659985 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2722,6 +2722,8 @@ static const struct dma_map_ops amd_iommu_dma_ops = {
         .map_sg         = map_sg,
         .unmap_sg       = unmap_sg,
         .dma_supported  = amd_iommu_dma_supported,
+        .mmap           = dma_common_mmap,
+        .get_sgtable    = dma_common_get_sgtable,
 };
 
 static int init_reserved_iova_ranges(void)
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 12d094d08c0a..dca1b06ce4ec 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -3738,6 +3738,8 @@ static const struct dma_map_ops intel_dma_ops = {
         .map_resource = intel_map_resource,
         .unmap_resource = intel_unmap_resource,
         .dma_supported = dma_direct_supported,
+        .mmap = dma_common_mmap,
+        .get_sgtable = dma_common_get_sgtable,
 };
 
 static inline int iommu_domain_cache_init(void)
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 217f15aafa4a..1d7125d29bee 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -1024,6 +1024,8 @@ static const struct dma_map_ops ccio_ops = {
         .unmap_page =           ccio_unmap_page,
         .map_sg =               ccio_map_sg,
         .unmap_sg =             ccio_unmap_sg,
+        .mmap =                 dma_common_mmap,
+        .get_sgtable =          dma_common_get_sgtable,
 };
 
 #ifdef CONFIG_PROC_FS
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index 296668caf7e5..fa4df65b7e28 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -1084,6 +1084,8 @@ static const struct dma_map_ops sba_ops = {
         .unmap_page =           sba_unmap_page,
         .map_sg =               sba_map_sg,
         .unmap_sg =             sba_unmap_sg,
+        .mmap =                 dma_common_mmap,
+        .get_sgtable =          dma_common_get_sgtable,
 };
 
 
diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c
index a136932b8e6d..c8b4e46407ba 100644
--- a/kernel/dma/mapping.c
+++ b/kernel/dma/mapping.c
@@ -153,11 +153,12 @@ int dma_get_sgtable_attrs(struct device *dev, struct sg_table *sgt,
 {
         const struct dma_map_ops *ops = get_dma_ops(dev);
 
-        if (!dma_is_direct(ops) && ops->get_sgtable)
-                return ops->get_sgtable(dev, sgt, cpu_addr, dma_addr, size,
-                                        attrs);
-        return dma_common_get_sgtable(dev, sgt, cpu_addr, dma_addr, size,
-                        attrs);
+        if (dma_is_direct(ops))
+                return dma_common_get_sgtable(dev, sgt, cpu_addr, dma_addr,
+                                size, attrs);
+        if (!ops->get_sgtable)
+                return -ENXIO;
+        return ops->get_sgtable(dev, sgt, cpu_addr, dma_addr, size, attrs);
 }
 EXPORT_SYMBOL(dma_get_sgtable_attrs);
 
@@ -240,9 +241,12 @@ int dma_mmap_attrs(struct device *dev, struct vm_area_struct *vma,
 {
         const struct dma_map_ops *ops = get_dma_ops(dev);
 
-        if (!dma_is_direct(ops) && ops->mmap)
-                return ops->mmap(dev, vma, cpu_addr, dma_addr, size, attrs);
-        return dma_common_mmap(dev, vma, cpu_addr, dma_addr, size, attrs);
+        if (dma_is_direct(ops))
+                return dma_common_mmap(dev, vma, cpu_addr, dma_addr, size,
+                                attrs);
+        if (!ops->mmap)
+                return -ENXIO;
+        return ops->mmap(dev, vma, cpu_addr, dma_addr, size, attrs);
 }
 EXPORT_SYMBOL(dma_mmap_attrs);