diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:41:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:41:34 +0200 |
| commit | 4b336b0625fe822cdc21646cc3bc3abacf05a3d0 (patch) | |
| tree | fc55023a26b76d8d2cc61803dc09323e020abf4e /include/asm-x86 | |
| parent | 0d1edf46ba229b46efacf75c0544b88c05a7b266 (diff) | |
| parent | 8978b74253280d59e97cf49a3ec2c0cbccd5b801 (diff) | |
Merge branch 'x86/urgent' into x86/xen
Diffstat (limited to 'include/asm-x86')
| -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; extern int force_iommu, no_iommu; extern int iommu_detected; +extern unsigned long iommu_num_pages(unsigned long addr, unsigned long len); + #ifdef CONFIG_GART_IOMMU extern int gart_iommu_aperture; extern int gart_iommu_aperture_allowed; |