The patch titled powerpc: rename iommu_num_pages function to iommu_nr_pages has been removed from the -mm tree. Its filename was powerpc-rename-iommu_num_pages-function-to-iommu_nr_pages.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: powerpc: rename iommu_num_pages function to iommu_nr_pages From: Joerg Roedel <joerg.roedel@xxxxxxx> This is a preparation patch for introducing a generic iommu_num_pages function. Signed-off-by: Joerg Roedel <joerg.roedel@xxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Cc: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> Cc: Muli Ben-Yehuda <muli@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/powerpc/kernel/iommu.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff -puN arch/powerpc/kernel/iommu.c~powerpc-rename-iommu_num_pages-function-to-iommu_nr_pages arch/powerpc/kernel/iommu.c --- a/arch/powerpc/kernel/iommu.c~powerpc-rename-iommu_num_pages-function-to-iommu_nr_pages +++ a/arch/powerpc/kernel/iommu.c @@ -51,7 +51,7 @@ static int protect4gb = 1; static void __iommu_free(struct iommu_table *, dma_addr_t, unsigned int); -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; @@ -325,7 +325,7 @@ int iommu_map_sg(struct device *dev, str } /* Allocate iommu entries for that segment */ vaddr = (unsigned long) sg_virt(s); - npages = iommu_num_pages(vaddr, slen); + npages = iommu_nr_pages(vaddr, slen); align = 0; if (IOMMU_PAGE_SHIFT < PAGE_SHIFT && slen >= PAGE_SIZE && (vaddr & ~PAGE_MASK) == 0) @@ -418,7 +418,7 @@ int iommu_map_sg(struct device *dev, str unsigned long vaddr, npages; vaddr = s->dma_address & IOMMU_PAGE_MASK; - npages = iommu_num_pages(s->dma_address, s->dma_length); + npages = iommu_nr_pages(s->dma_address, s->dma_length); __iommu_free(tbl, vaddr, npages); s->dma_address = DMA_ERROR_CODE; s->dma_length = 0; @@ -452,7 +452,7 @@ void iommu_unmap_sg(struct iommu_table * if (sg->dma_length == 0) break; - npages = iommu_num_pages(dma_handle, sg->dma_length); + npages = iommu_nr_pages(dma_handle, sg->dma_length); __iommu_free(tbl, dma_handle, npages); sg = sg_next(sg); } @@ -584,7 +584,7 @@ dma_addr_t iommu_map_single(struct devic BUG_ON(direction == DMA_NONE); uaddr = (unsigned long)vaddr; - npages = iommu_num_pages(uaddr, size); + npages = iommu_nr_pages(uaddr, size); if (tbl) { align = 0; @@ -617,7 +617,7 @@ void iommu_unmap_single(struct iommu_tab BUG_ON(direction == DMA_NONE); if (tbl) { - npages = iommu_num_pages(dma_handle, size); + npages = iommu_nr_pages(dma_handle, size); iommu_free(tbl, dma_handle, npages); } } _ Patches currently in -mm which might be from joerg.roedel@xxxxxxx are origin.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html