projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.27-rc3' into x86/xsave
[linux-2.6-block.git]
/
include
/
asm-x86
/
iommu.h
diff --git
a/include/asm-x86/iommu.h
b/include/asm-x86/iommu.h
index bdb823e6edb4782884010c16ec6d3c067dc9fcb2..e86f44148c66f043cfb3a9ba9dfc1419cc2b25da 100644
(file)
--- 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;