diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-14 05:49:35 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-14 05:49:35 -1000 |
| commit | c78ad1be4b4d65eb214421b90a788abf3c85c3ea (patch) | |
| tree | d0959f89fe941b212f058c7633928c7d9856a602 /drivers/iommu/iommu.c | |
| parent | 7617c9a087d2036e12e1524a03d064884730f4a1 (diff) | |
| parent | 4e4abae311e4b44aaf61f18a826fd7136037f199 (diff) | |
| download | linux-c78ad1be4b4d65eb214421b90a788abf3c85c3ea.tar.gz | |
Merge tag 'iommu-fixes-v5.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull iommu fixes from Joerg Roedel:
- three fixes for Intel VT-d to fix a potential dead-lock, a formatting
fix and a bit setting fix
- one fix for the ARM-SMMU to make it work on some platforms with
sub-optimal SMMU emulation
* tag 'iommu-fixes-v5.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/arm-smmu: Avoid constant zero in TLBI writes
iommu/vt-d: Set the right field for Page Walk Snoop
iommu/vt-d: Fix lock inversion between iommu->lock and device_domain_lock
iommu: Add missing new line for dma type
Diffstat (limited to 'drivers/iommu/iommu.c')
| -rw-r--r-- | drivers/iommu/iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index f9cacce909d3..9f0a2844371c 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -329,7 +329,7 @@ static ssize_t iommu_group_show_type(struct iommu_group *group, type = "unmanaged\n"; break; case IOMMU_DOMAIN_DMA: - type = "DMA"; + type = "DMA\n"; break; } } |