diff options
| author | Jesse Barnes <jbarnes@hobbes.lan> | 2008-07-28 23:31:10 +0200 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-07-28 23:31:10 +0200 |
| commit | 29111f579f4f3f2a07385f931854ab0527ae7ea5 (patch) | |
| tree | 0271f20b0c954fa364be8627e0d6065544de0534 /include | |
| parent | PCI: handle 64-bit resources better on 32-bit machines (diff) | |
| parent | x86 gart: replace to_pages macro with iommu_num_pages (diff) | |
| download | linux-29111f579f4f3f2a07385f931854ab0527ae7ea5.tar.xz linux-29111f579f4f3f2a07385f931854ab0527ae7ea5.zip | |
Merge branch 'x86/iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into for-linus
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/iommu-helper.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/iommu-helper.h b/include/linux/iommu-helper.h index c975caf75385..f8598f583944 100644 --- a/include/linux/iommu-helper.h +++ b/include/linux/iommu-helper.h @@ -8,3 +8,4 @@ extern unsigned long iommu_area_alloc(unsigned long *map, unsigned long size, unsigned long align_mask); extern void iommu_area_free(unsigned long *map, unsigned long start, unsigned int nr); +extern unsigned long iommu_num_pages(unsigned long addr, unsigned long len); |