diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-09 22:30:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-09 22:30:55 -0700 |
| commit | 179145e6312b1ccb1731841360d7fcaf2f4abc7a (patch) | |
| tree | 68108aa8d2d109a9ad4ab7c95bd9ccec7e727f0b /include | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input (diff) | |
| parent | arm: dma-mapping: Reset the device's dma_ops (diff) | |
| download | linux-dev-179145e6312b1ccb1731841360d7fcaf2f4abc7a.tar.xz linux-dev-179145e6312b1ccb1731841360d7fcaf2f4abc7a.zip | |
Merge tag 'iommu-fixes-v4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull IOMMU fixes from Joerg Roedel:
- another compile-fix for my header cleanup
- a couple of fixes for the recently merged IOMMU probe deferal code
- fixes for ACPI/IORT code necessary with IOMMU probe deferal
* tag 'iommu-fixes-v4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
arm: dma-mapping: Reset the device's dma_ops
ACPI/IORT: Move the check to get iommu_ops from translated fwspec
ARM: dma-mapping: Don't tear down third-party mappings
ACPI/IORT: Ignore all errors except EPROBE_DEFER
iommu/of: Ignore all errors except EPROBE_DEFER
iommu/of: Fix check for returning EPROBE_DEFER
iommu/dma: Fix function declaration
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dma-iommu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/dma-iommu.h b/include/linux/dma-iommu.h index 4eac2670bfa1..92f20832fd28 100644 --- a/include/linux/dma-iommu.h +++ b/include/linux/dma-iommu.h @@ -78,6 +78,7 @@ void iommu_dma_get_resv_regions(struct device *dev, struct list_head *list); struct iommu_domain; struct msi_msg; +struct device; static inline int iommu_dma_init(void) { |