diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-09 10:23:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-09 10:23:45 -0700 |
| commit | 1a59c53920eed3b2718c07286f1afe8674a7d9e6 (patch) | |
| tree | 3ec8292d56ad44a2d1c30b8deafae189ce7f1b6d /include | |
| parent | Revert "ib_srpt: Convert to percpu_ida tag allocation" (diff) | |
| parent | iommu/vt-d: Silence an uninitialized variable warning (diff) | |
| download | linux-dev-1a59c53920eed3b2718c07286f1afe8674a7d9e6.tar.xz linux-dev-1a59c53920eed3b2718c07286f1afe8674a7d9e6.zip | |
Merge tag 'iommu-fixes-v4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull IOMMU fixes from Joerg Roedel:
- compile-time fixes (warnings and failures)
- a bug in iommu core code which could cause the group->domain pointer
to be falsly cleared
- fix in scatterlist handling of the ARM common DMA-API code
- stall detection fix for the Rockchip IOMMU driver
* tag 'iommu-fixes-v4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/vt-d: Silence an uninitialized variable warning
iommu/rockchip: Fix "is stall active" check
iommu: Don't overwrite domain pointer when there is no default_domain
iommu/dma: Restore scatterlist offsets correctly
iommu: provide of_xlate pointer unconditionally
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/iommu.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/iommu.h b/include/linux/iommu.h index a5c539fa5d2b..ef7a6ecd8584 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -195,9 +195,7 @@ struct iommu_ops { /* Get the number of windows per domain */ u32 (*domain_get_windows)(struct iommu_domain *domain); -#ifdef CONFIG_OF_IOMMU int (*of_xlate)(struct device *dev, struct of_phandle_args *args); -#endif unsigned long pgsize_bitmap; void *priv; |