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

[linux-2.6-microblaze.git] / include / linux / tboot.h

diff --git a/include/linux/tboot.h b/include/linux/tboot.h
index 5146d25..d227916 100644 (file)
--- a/include/linux/tboot.h
+++ b/include/linux/tboot.h
@@ -126,7 +126,6 @@ extern void tboot_probe(void);
 extern void tboot_shutdown(u32 shutdown_type);
 extern struct acpi_table_header *tboot_get_dmar_table(
                                      struct acpi_table_header *dmar_tbl);
-extern int tboot_force_iommu(void);
 
 #else
 
@@ -136,7 +135,6 @@ extern int tboot_force_iommu(void);
 #define tboot_sleep(sleep_state, pm1a_control, pm1b_control)   \
                                        do { } while (0)
 #define tboot_get_dmar_table(dmar_tbl) (dmar_tbl)
-#define tboot_force_iommu()            0
 
 #endif /* !CONFIG_INTEL_TXT */