diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-10-07 20:11:21 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-10-07 20:11:21 +0200 |
commit | 601d62959d08a450d4666c728ddd2f47c5ba1cfe (patch) | |
tree | 52d9f3c1a2528a9de405d5a19014f3f94b16b35d /include/linux/iova.h | |
parent | 225db5762dc1a35b26850477ffa06e5cd0097243 (diff) | |
parent | e4fc141d2a022a63c87a4851b3c688eca6a1647b (diff) |
Merge tag 'asoc-fix-v4.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.3
Quite a few fixes here but they're all very small and driver specific,
none of them really stand out if you aren't using the relevant hardware
but they're all useful if you do happen to have an affected device.
Diffstat (limited to 'include/linux/iova.h')
-rw-r--r-- | include/linux/iova.h | 4 |
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); |