diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 10:16:15 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 10:16:15 -0400 |
| commit | 1a10390708d675ebf1a2f5e169a5165626afbd88 (patch) | |
| tree | d9ee7d10abd65e580fb74152a501089f51174225 /include/asm-x86/iommu.h | |
| parent | 239bd83104ec6bcba90221d8b0973d2565142ef8 (diff) | |
| parent | b635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff) | |
Merge branch 'linus' into x86/cpu
Diffstat (limited to 'include/asm-x86/iommu.h')
| -rw-r--r-- | include/asm-x86/iommu.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/iommu.h b/include/asm-x86/iommu.h index ecc8061904a9..5f888cc5be49 100644 --- a/include/asm-x86/iommu.h +++ b/include/asm-x86/iommu.h | |||
| @@ -7,6 +7,8 @@ extern struct dma_mapping_ops nommu_dma_ops; | |||
| 7 | extern int force_iommu, no_iommu; | 7 | extern int force_iommu, no_iommu; |
| 8 | extern int iommu_detected; | 8 | extern int iommu_detected; |
| 9 | 9 | ||
| 10 | extern unsigned long iommu_num_pages(unsigned long addr, unsigned long len); | ||
| 11 | |||
| 10 | #ifdef CONFIG_GART_IOMMU | 12 | #ifdef CONFIG_GART_IOMMU |
| 11 | extern int gart_iommu_aperture; | 13 | extern int gart_iommu_aperture; |
| 12 | extern int gart_iommu_aperture_allowed; | 14 | extern int gart_iommu_aperture_allowed; |