Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 358819
b: refs/heads/master
c: 18177d1
h: refs/heads/master
i:
  358817: 628848c
  358815: afff27b
v: v3
  • Loading branch information
Prathyush K authored and Marek Szyprowski committed Feb 25, 2013
1 parent 05b0c4a commit 1bf1536
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6fe367580339a3adf77273d4366652665319bdeb
refs/heads/master: 18177d12c0cee5646c7c2045ea90ddf882011c97
4 changes: 4 additions & 0 deletions trunk/arch/arm/mm/dma-mapping.c
Original file line number Diff line number Diff line change
Expand Up @@ -1803,6 +1803,7 @@ arm_iommu_create_mapping(struct bus_type *bus, dma_addr_t base, size_t size,
err:
return ERR_PTR(err);
}
EXPORT_SYMBOL_GPL(arm_iommu_create_mapping);

static void release_iommu_mapping(struct kref *kref)
{
Expand All @@ -1819,6 +1820,7 @@ void arm_iommu_release_mapping(struct dma_iommu_mapping *mapping)
if (mapping)
kref_put(&mapping->kref, release_iommu_mapping);
}
EXPORT_SYMBOL_GPL(arm_iommu_release_mapping);

/**
* arm_iommu_attach_device
Expand Down Expand Up @@ -1847,6 +1849,7 @@ int arm_iommu_attach_device(struct device *dev,
pr_debug("Attached IOMMU controller to %s device.\n", dev_name(dev));
return 0;
}
EXPORT_SYMBOL_GPL(arm_iommu_attach_device);

/**
* arm_iommu_detach_device
Expand All @@ -1872,5 +1875,6 @@ void arm_iommu_detach_device(struct device *dev)

pr_debug("Detached IOMMU controller from %s device.\n", dev_name(dev));
}
EXPORT_SYMBOL_GPL(arm_iommu_detach_device);

#endif

0 comments on commit 1bf1536

Please sign in to comment.