aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-05 19:03:11 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-05 19:03:11 -0800
commit0578c3b4d44c34e499e1fd5916ed6c63635b25cf (patch)
tree7bcf1e4bb08984b2f5671a48c052c26903855ba6 /include
parent7d8a804c594b61a05c698126165b5dc417d94a0f (diff)
parent52942b6b16c6ebb25f4dd4df0208d840ba0cbc5c (diff)
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: swiotlb: Don't include linux/swiotlb.h twice in lib/swiotlb.c intel-iommu: fix build error with INTR_REMAP=y and DMAR=n swiotlb: add missing __init annotations
Diffstat (limited to 'include')
-rw-r--r--include/linux/dma_remapping.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/dma_remapping.h b/include/linux/dma_remapping.h
index 136f170cecc..af1dab41674 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;