diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-20 19:20:16 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-20 19:20:16 +0100 |
| commit | fc8299f9f3b9f3b0e1c8c9f719b5deb2a74ab314 (patch) | |
| tree | e6b57d85889b4b699e22542af0863ceacbaca237 /include | |
| parent | Merge tag 'mmc-v5.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ul... (diff) | |
| parent | MAINTAINERS: Temporarily add myself to the IOMMU entry (diff) | |
| download | linux-fc8299f9f3b9f3b0e1c8c9f719b5deb2a74ab314.tar.xz linux-fc8299f9f3b9f3b0e1c8c9f719b5deb2a74ab314.zip | |
Merge tag 'iommu-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull iommu fixes from Will Deacon:
"Two straightforward vt-d fixes:
- Fix boot when intel iommu initialisation fails under TXT (tboot)
- Fix intel iommu compilation error when DMAR is enabled without ATS
and temporarily update IOMMU MAINTAINERs entry"
* tag 'iommu-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
MAINTAINERS: Temporarily add myself to the IOMMU entry
iommu/vt-d: Fix compile error with CONFIG_PCI_ATS not set
iommu/vt-d: Avoid panic if iommu init fails in tboot system
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/intel-iommu.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index fbf5b3e7707e..d956987ed032 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -798,7 +798,6 @@ extern int iommu_calculate_agaw(struct intel_iommu *iommu); extern int iommu_calculate_max_sagaw(struct intel_iommu *iommu); extern int dmar_disabled; extern int intel_iommu_enabled; -extern int intel_iommu_tboot_noforce; extern int intel_iommu_gfx_mapped; #else static inline int iommu_calculate_agaw(struct intel_iommu *iommu) |