diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/dmar.h | 4 | ||||
-rw-r--r-- | include/linux/intel-iommu.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/dmar.h b/include/linux/dmar.h index 205ee37eed73..1a60dd630bb4 100644 --- a/include/linux/dmar.h +++ b/include/linux/dmar.h | |||
@@ -33,6 +33,7 @@ struct acpi_dmar_header; | |||
33 | #define DMAR_X2APIC_OPT_OUT 0x2 | 33 | #define DMAR_X2APIC_OPT_OUT 0x2 |
34 | 34 | ||
35 | struct intel_iommu; | 35 | struct intel_iommu; |
36 | |||
36 | #ifdef CONFIG_DMAR_TABLE | 37 | #ifdef CONFIG_DMAR_TABLE |
37 | extern struct acpi_table_header *dmar_tbl; | 38 | extern struct acpi_table_header *dmar_tbl; |
38 | struct dmar_drhd_unit { | 39 | struct dmar_drhd_unit { |
@@ -69,9 +70,6 @@ extern void dmar_free_dev_scope(struct pci_dev ***devices, int *cnt); | |||
69 | /* Intel IOMMU detection */ | 70 | /* Intel IOMMU detection */ |
70 | extern int detect_intel_iommu(void); | 71 | extern int detect_intel_iommu(void); |
71 | extern int enable_drhd_fault_handling(void); | 72 | extern int enable_drhd_fault_handling(void); |
72 | |||
73 | extern int parse_ioapics_under_ir(void); | ||
74 | extern int alloc_iommu(struct dmar_drhd_unit *); | ||
75 | #else | 73 | #else |
76 | static inline int detect_intel_iommu(void) | 74 | static inline int detect_intel_iommu(void) |
77 | { | 75 | { |
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index de1e5e936420..f2c4114b8665 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h | |||
@@ -348,7 +348,6 @@ static inline void __iommu_flush_cache( | |||
348 | extern struct dmar_drhd_unit * dmar_find_matched_drhd_unit(struct pci_dev *dev); | 348 | extern struct dmar_drhd_unit * dmar_find_matched_drhd_unit(struct pci_dev *dev); |
349 | extern int dmar_find_matched_atsr_unit(struct pci_dev *dev); | 349 | extern int dmar_find_matched_atsr_unit(struct pci_dev *dev); |
350 | 350 | ||
351 | extern int alloc_iommu(struct dmar_drhd_unit *drhd); | ||
352 | extern void free_iommu(struct intel_iommu *iommu); | 351 | extern void free_iommu(struct intel_iommu *iommu); |
353 | extern int dmar_enable_qi(struct intel_iommu *iommu); | 352 | extern int dmar_enable_qi(struct intel_iommu *iommu); |
354 | extern void dmar_disable_qi(struct intel_iommu *iommu); | 353 | extern void dmar_disable_qi(struct intel_iommu *iommu); |