diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-19 17:51:17 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-19 17:51:16 -0700 |
| commit | 1a004523b901d563355cbcb02224b1ed9d7626a0 (patch) | |
| tree | f1002e7ac156963b23d5a986fe4ed936927ea119 /include/linux | |
| parent | 4bf1a46f9061bbd70e8b1475e5d913c2afb22986 (diff) | |
| parent | 05f15e3f74c903e874d227609821724e381f0aba (diff) | |
Merge "iommu: msm: ensure lazy mappings are unmapped on detach"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/msm_dma_iommu_mapping.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/msm_dma_iommu_mapping.h b/include/linux/msm_dma_iommu_mapping.h index 370d6f5e1d65..76451faa2073 100644 --- a/include/linux/msm_dma_iommu_mapping.h +++ b/include/linux/msm_dma_iommu_mapping.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -50,6 +50,7 @@ static inline int msm_dma_map_sg(struct device *dev, struct scatterlist *sg, void msm_dma_unmap_sg(struct device *dev, struct scatterlist *sgl, int nents, enum dma_data_direction dir, struct dma_buf *dma_buf); +int msm_dma_unmap_all_for_dev(struct device *dev); /* * Below is private function only to be called by framework (ION) and not by @@ -89,6 +90,11 @@ static inline void msm_dma_unmap_sg(struct device *dev, { } +int msm_dma_unmap_all_for_dev(struct device *dev) +{ + return 0; +} + static inline void msm_dma_buf_freed(void *buffer) {} #endif /*CONFIG_IOMMU_API*/ |