diff options
| author | Jesse Barnes <jbarnes@hobbes.lan> | 2008-07-28 17:31:10 -0400 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-07-28 17:31:10 -0400 |
| commit | 29111f579f4f3f2a07385f931854ab0527ae7ea5 (patch) | |
| tree | 0271f20b0c954fa364be8627e0d6065544de0534 /include/linux | |
| parent | cc5499c3a607a392e8a7adb934aaf14b2c6a3519 (diff) | |
| parent | 87e39ea5714dd59ba31e36c25833d2b20255a29d (diff) | |
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/linux')
| -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, | |||
| 8 | unsigned long align_mask); | 8 | unsigned long align_mask); |
| 9 | extern void iommu_area_free(unsigned long *map, unsigned long start, | 9 | extern void iommu_area_free(unsigned long *map, unsigned long start, |
| 10 | unsigned int nr); | 10 | unsigned int nr); |
| 11 | extern unsigned long iommu_num_pages(unsigned long addr, unsigned long len); | ||