diff options
| author |   Joerg Roedel <joerg.roedel@amd.com> | 2008-10-15 22:02:08 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 11:21:33 -0700 |
| commit | a7375762a5dca3e468f17e0b2e312b362dc9ef4c (patch) | |
| tree | 5908368d25ce179adec2e017e3f764483cb94298 /arch/sparc64/kernel/iommu_common.h | |
| parent | x86: rename iommu_num_pages function to iommu_nr_pages (diff) | |
| download | linux-dev-a7375762a5dca3e468f17e0b2e312b362dc9ef4c.tar.xz linux-dev-a7375762a5dca3e468f17e0b2e312b362dc9ef4c.zip | |
sparc64: rename iommu_num_pages function to iommu_nr_pages
This is a preparation patch for introducing a generic iommu_num_pages function.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Acked-by: David S. Miller <davem@davemloft.net>
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/sparc64/kernel/iommu_common.h')
| -rw-r--r-- | arch/sparc64/kernel/iommu_common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/iommu_common.h b/arch/sparc64/kernel/iommu_common.h index 53b19c8231a9..202d8ae2a67e 100644 --- a/arch/sparc64/kernel/iommu_common.h +++ b/arch/sparc64/kernel/iommu_common.h @@ -35,7 +35,7 @@ #define SG_ENT_PHYS_ADDRESS(SG) (__pa(sg_virt((SG)))) -static inline unsigned long iommu_num_pages(unsigned long vaddr, +static inline unsigned long iommu_nr_pages(unsigned long vaddr, unsigned long slen) { unsigned long npages; @@ -53,7 +53,7 @@ static inline int is_span_boundary(unsigned long entry, struct scatterlist *sg) { unsigned long paddr = SG_ENT_PHYS_ADDRESS(outs); - int nr = iommu_num_pages(paddr, outs->dma_length + sg->length); + int nr = iommu_nr_pages(paddr, outs->dma_length + sg->length); return iommu_is_span_boundary(entry, nr, shift, boundary_size); } |