diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2020-11-23 16:50:59 -0400 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2020-11-23 16:50:59 -0400 |
| commit | ed92f6a52b84c0c03ae9d829cf118c6e38e456fb (patch) | |
| tree | 7b85d805aa96e8b89e8be80bd03c6e43b1e6db62 /arch/x86/kernel/tboot.c | |
| parent | df0e4de29c75fab2d59b67b7542ea1e10d32c6e1 (diff) | |
| parent | 418baf2c28f3473039f2f7377760bd8f6897ae18 (diff) | |
| download | linux-next-ed92f6a52b84c0c03ae9d829cf118c6e38e456fb.tar.gz | |
Merge tag 'v5.10-rc5' into rdma.git for-next
For dependencies in following patches
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'arch/x86/kernel/tboot.c')
| -rw-r--r-- | arch/x86/kernel/tboot.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c index 992fb1415c0f..420be871d9d4 100644 --- a/arch/x86/kernel/tboot.c +++ b/arch/x86/kernel/tboot.c @@ -514,9 +514,6 @@ int tboot_force_iommu(void) if (!tboot_enabled()) return 0; - if (intel_iommu_tboot_noforce) - return 1; - if (no_iommu || swiotlb || dmar_disabled) pr_warn("Forcing Intel-IOMMU to enabled\n"); |