diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 06:41:34 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 06:41:34 -0400 |
| commit | 4b336b0625fe822cdc21646cc3bc3abacf05a3d0 (patch) | |
| tree | fc55023a26b76d8d2cc61803dc09323e020abf4e /lib | |
| parent | 0d1edf46ba229b46efacf75c0544b88c05a7b266 (diff) | |
| parent | 8978b74253280d59e97cf49a3ec2c0cbccd5b801 (diff) | |
Merge branch 'x86/urgent' into x86/xen
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/iommu-helper.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/iommu-helper.c b/lib/iommu-helper.c index 889ddce2021e..a3b8d4c3f77a 100644 --- a/lib/iommu-helper.c +++ b/lib/iommu-helper.c | |||
| @@ -80,11 +80,3 @@ void iommu_area_free(unsigned long *map, unsigned long start, unsigned int nr) | |||
| 80 | } | 80 | } |
| 81 | } | 81 | } |
| 82 | EXPORT_SYMBOL(iommu_area_free); | 82 | EXPORT_SYMBOL(iommu_area_free); |
| 83 | |||
| 84 | unsigned long iommu_num_pages(unsigned long addr, unsigned long len) | ||
| 85 | { | ||
| 86 | unsigned long size = roundup((addr & ~PAGE_MASK) + len, PAGE_SIZE); | ||
| 87 | |||
| 88 | return size >> PAGE_SHIFT; | ||
| 89 | } | ||
| 90 | EXPORT_SYMBOL(iommu_num_pages); | ||