Merge tag 'iommu-updates-v5.20-or-v6.0' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / x86 / kernel / tboot.c

diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
index 0c1154a1c40327b5624d79c50d07a8876861a0f6..3bacd935f840b933b28081dd25b27eb02d9bdf26 100644 (file)
--- a/arch/x86/kernel/tboot.c
+++ b/arch/x86/kernel/tboot.c
@@ -6,7 +6,6 @@
  * Copyright (c) 2006-2009, Intel Corporation
  */
 
-#include <linux/intel-iommu.h>
 #include <linux/init_task.h>
 #include <linux/spinlock.h>
 #include <linux/export.h>
@@ -516,17 +515,3 @@ struct acpi_table_header *tboot_get_dmar_table(struct acpi_table_header *dmar_tb
 
        return dmar_tbl;
 }
-
-int tboot_force_iommu(void)
-{
-       if (!tboot_enabled())
-               return 0;
-
-       if (no_iommu || dmar_disabled)
-               pr_warn("Forcing Intel-IOMMU to enabled\n");
-
-       dmar_disabled = 0;
-       no_iommu = 0;
-
-       return 1;
-}