diff options
-rw-r--r-- | drivers/pci/intel-iommu.c | 6 | ||||
-rw-r--r-- | include/linux/intel-iommu.h | 9 |
2 files changed, 0 insertions, 15 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c index 81e04ec85d97..ecb5fd3b71f7 100644 --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c | |||
@@ -3105,12 +3105,6 @@ static void intel_iommu_unmap_range(struct iommu_domain *domain, | |||
3105 | dmar_domain->max_addr = base; | 3105 | dmar_domain->max_addr = base; |
3106 | } | 3106 | } |
3107 | 3107 | ||
3108 | int intel_iommu_found(void) | ||
3109 | { | ||
3110 | return g_num_of_iommus; | ||
3111 | } | ||
3112 | EXPORT_SYMBOL_GPL(intel_iommu_found); | ||
3113 | |||
3114 | static phys_addr_t intel_iommu_iova_to_phys(struct iommu_domain *domain, | 3108 | static phys_addr_t intel_iommu_iova_to_phys(struct iommu_domain *domain, |
3115 | unsigned long iova) | 3109 | unsigned long iova) |
3116 | { | 3110 | { |
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index 26ccc0294567..c4f6c101dbcd 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h | |||
@@ -330,15 +330,6 @@ extern int qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr, | |||
330 | 330 | ||
331 | extern void qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu); | 331 | extern void qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu); |
332 | 332 | ||
333 | #ifdef CONFIG_DMAR | ||
334 | int intel_iommu_found(void); | ||
335 | #else /* CONFIG_DMAR */ | ||
336 | static inline int intel_iommu_found(void) | ||
337 | { | ||
338 | return 0; | ||
339 | } | ||
340 | #endif /* CONFIG_DMAR */ | ||
341 | |||
342 | extern void *intel_alloc_coherent(struct device *, size_t, dma_addr_t *, gfp_t); | 333 | extern void *intel_alloc_coherent(struct device *, size_t, dma_addr_t *, gfp_t); |
343 | extern void intel_free_coherent(struct device *, size_t, void *, dma_addr_t); | 334 | extern void intel_free_coherent(struct device *, size_t, void *, dma_addr_t); |
344 | extern dma_addr_t intel_map_single(struct device *, phys_addr_t, size_t, int); | 335 | extern dma_addr_t intel_map_single(struct device *, phys_addr_t, size_t, int); |