path: root/include
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2015-10-02 07:59:29 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-10-02 07:59:29 -0400
commit8c25ab8b5a04a7c559aa8fd4cabe5fc4463b8ada (patch)
tree9cdc7d9cb6576fa757277cd2e3ad8231191442b9 /include
parentbde17b90dd9712cb61a7ab0c1ccd0f7f6aa57957 (diff)
parent15bbdec3931e617231c12b0920e497e87ec8c2c6 (diff)
Merge git://git.infradead.org/intel-iommu
Pull IOVA fixes from David Woodhouse: "The main fix here is the first one, fixing the over-allocation of size-aligned requests. The other patches simply make the existing IOVA code available to users other than the Intel VT-d driver, with no functional change. I concede the latter really *should* have been submitted during the merge window, but since it's basically risk-free and people are waiting to build on top of it and it's my fault I didn't get it in, I (and they) would be grateful if you'd take it" * git://git.infradead.org/intel-iommu: iommu: Make the iova library a module iommu: iova: Export symbols iommu: iova: Move iova cache management to the iova library iommu/iova: Avoid over-allocating when size-aligned
Diffstat (limited to 'include')
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/iova.h b/include/linux/iova.h
index 3920a19d8194..92f7177db2ce 100644
--- a/include/linux/iova.h
+++ b/include/linux/iova.h
@@ -68,8 +68,8 @@ static inline unsigned long iova_pfn(struct iova_domain *iovad, dma_addr_t iova)
return iova >> iova_shift(iovad);
-int iommu_iova_cache_init(void);
-void iommu_iova_cache_destroy(void);
+int iova_cache_get(void);
+void iova_cache_put(void);
struct iova *alloc_iova_mem(void);
void free_iova_mem(struct iova *iova);