diff options
| author |   FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2008-07-29 13:38:53 +0900 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-07-29 12:12:48 +0200 |
| commit | 8978b74253280d59e97cf49a3ec2c0cbccd5b801 (patch) | |
| tree | 7cecd6951437f01f541178c1afc14d4e1d2e2b23 /include/asm-x86 | |
| parent | Merge commit 'v2.6.27-rc1' into x86/urgent (diff) | |
| download | linux-dev-8978b74253280d59e97cf49a3ec2c0cbccd5b801.tar.xz linux-dev-8978b74253280d59e97cf49a3ec2c0cbccd5b801.zip | |
generic, x86: fix add iommu_num_pages helper function
This IOMMU helper function doesn't work for some architectures:
http://marc.info/?l=linux-kernel&m=121699304403202&w=2
It also breaks POWER and SPARC builds:
http://marc.info/?l=linux-kernel&m=121730388001890&w=2
Currently, only x86 IOMMUs use this so let's move it to x86 for
now.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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; |