diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-04 10:55:02 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-04 11:00:05 +0100 |
| commit | c66b9906f863696159e05890bb7123269bb9a9de (patch) | |
| tree | 8aa2277b033eb8c823289575134d21180ce42e73 | |
| parent | 4010b0192ddf6ec7ec1b9feb9b0953692aeb7329 (diff) | |
| download | linux-c66b9906f863696159e05890bb7123269bb9a9de.tar.gz linux-c66b9906f863696159e05890bb7123269bb9a9de.tar.bz2 linux-c66b9906f863696159e05890bb7123269bb9a9de.zip | |
intel-iommu: fix build error with INTR_REMAP=y and DMAR=n
dmar.o can be built in the CONFIG_INTR_REMAP=y case but
iommu_calculate_agaw() is only available if VT-d is built as well.
So create an inline version of iommu_calculate_agaw() for the
!CONFIG_DMAR case. The iommu->agaw value wont be used in this
case, but the code is cleaner (has less #ifdefs) if we have it around
unconditionally.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | include/linux/dma_remapping.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/dma_remapping.h b/include/linux/dma_remapping.h index 136f170cecc2..af1dab41674b 100644 --- a/include/linux/dma_remapping.h +++ b/include/linux/dma_remapping.h @@ -17,7 +17,15 @@ struct dmar_domain; struct root_entry; extern void free_dmar_iommu(struct intel_iommu *iommu); + +#ifdef CONFIG_DMAR extern int iommu_calculate_agaw(struct intel_iommu *iommu); +#else +static inline int iommu_calculate_agaw(struct intel_iommu *iommu) +{ + return 0; +} +#endif extern int dmar_disabled; |