Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...

[linux-2.6-omap-h63xx.git] / include / asm-x86 / iommu.h

diff --git a/include/asm-x86/iommu.h b/include/asm-x86/iommu.h
index e86f44148c66f043cfb3a9ba9dfc1419cc2b25da..2daaffcda52f86df2c04d6359674dfb8511723fc 100644 (file)
--- a/include/asm-x86/iommu.h
+++ b/include/asm-x86/iommu.h
@@ -6,8 +6,13 @@ extern void no_iommu_init(void);
 extern struct dma_mapping_ops nommu_dma_ops;
 extern int force_iommu, no_iommu;
 extern int iommu_detected;
+extern int dmar_disabled;
+extern int forbid_dac;
 
-extern unsigned long iommu_num_pages(unsigned long addr, unsigned long len);
+extern unsigned long iommu_nr_pages(unsigned long addr, unsigned long len);
+
+/* 10 seconds */
+#define DMAR_OPERATION_TIMEOUT ((cycles_t) tsc_khz*10*1000)
 
 #ifdef CONFIG_GART_IOMMU
 extern int gart_iommu_aperture;