summaryrefslogtreecommitdiff
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-06-30 10:37:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-06-30 10:37:48 -0700
commit27ab862a3afdd7a0285b69a7475f8af7bd2434c4 (patch)
treeba8b6be81c3019b1e59c00ec526113c779f65747 /arch/x86/kernel
parent4adc6b9382d5a2c1f39fa44b1e6ff29467e844e5 (diff)
parent84a21dbdef0b96d773599c33c2afbb002198d303 (diff)
Merge tag 'iommu-fixes-v4.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull IOMMU fixes from Joerg Roedel: "Two fixes: - A fix for AMD IOMMU interrupt remapping code when IRQs are forwarded directly to KVM guests - Fixed check in the recently merged code to allow tboot with Intel VT-d disabled" * tag 'iommu-fixes-v4.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: iommu/amd: Fix interrupt remapping when disable guest_mode iommu/vt-d: Correctly disable Intel IOMMU force on
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/tboot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
index 4b1724059909..a4eb27918ceb 100644
--- a/arch/x86/kernel/tboot.c
+++ b/arch/x86/kernel/tboot.c
@@ -514,7 +514,7 @@ int tboot_force_iommu(void)
if (!tboot_enabled())
return 0;
- if (!intel_iommu_tboot_noforce)
+ if (intel_iommu_tboot_noforce)
return 1;
if (no_iommu || swiotlb || dmar_disabled)