The patch titled ioremap: use apply_to_page_range_batch() for ioremap_page_range() has been removed from the -mm tree. Its filename was ioremap-use-apply_to_page_range_batch-for-ioremap_page_range.patch This patch was dropped because an updated version will be merged The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: ioremap: use apply_to_page_range_batch() for ioremap_page_range() From: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx> Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx> Cc: Nick Piggin <npiggin@xxxxxxxxx> Cc: Hugh Dickins <hugh.dickins@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- lib/ioremap.c | 85 ++++++++++++------------------------------------ 1 file changed, 22 insertions(+), 63 deletions(-) diff -puN lib/ioremap.c~ioremap-use-apply_to_page_range_batch-for-ioremap_page_range lib/ioremap.c --- a/lib/ioremap.c~ioremap-use-apply_to_page_range_batch-for-ioremap_page_range +++ a/lib/ioremap.c @@ -13,81 +13,40 @@ #include <asm/cacheflush.h> #include <asm/pgtable.h> -static int ioremap_pte_range(pmd_t *pmd, unsigned long addr, - unsigned long end, phys_addr_t phys_addr, pgprot_t prot) +struct ioremap_data { - pte_t *pte; + phys_addr_t phys_addr; + pgprot_t prot; +}; + +static int ioremap_pte_range(pte_t *pte, unsigned count, + unsigned long addr, void *v) +{ + struct ioremap_data *data = v; u64 pfn; - pfn = phys_addr >> PAGE_SHIFT; - pte = pte_alloc_kernel(pmd, addr); - if (!pte) - return -ENOMEM; - do { - BUG_ON(!pte_none(*pte)); - set_pte_at(&init_mm, addr, pte, pfn_pte(pfn, prot)); - pfn++; - } while (pte++, addr += PAGE_SIZE, addr != end); - return 0; -} + pfn = data->phys_addr >> PAGE_SHIFT; + data->phys_addr += count * PAGE_SIZE; -static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr, - unsigned long end, phys_addr_t phys_addr, pgprot_t prot) -{ - pmd_t *pmd; - unsigned long next; + while (count--) { + BUG_ON(!pte_none(*pte)); - phys_addr -= addr; - pmd = pmd_alloc(&init_mm, pud, addr); - if (!pmd) - return -ENOMEM; - do { - next = pmd_addr_end(addr, end); - if (ioremap_pte_range(pmd, addr, next, phys_addr + addr, prot)) - return -ENOMEM; - } while (pmd++, addr = next, addr != end); - return 0; -} + set_pte_at(&init_mm, addr, pte++, pfn_pte(pfn++, data->prot)); -static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr, - unsigned long end, phys_addr_t phys_addr, pgprot_t prot) -{ - pud_t *pud; - unsigned long next; + addr += PAGE_SIZE; + } - phys_addr -= addr; - pud = pud_alloc(&init_mm, pgd, addr); - if (!pud) - return -ENOMEM; - do { - next = pud_addr_end(addr, end); - if (ioremap_pmd_range(pud, addr, next, phys_addr + addr, prot)) - return -ENOMEM; - } while (pud++, addr = next, addr != end); return 0; } -int ioremap_page_range(unsigned long addr, - unsigned long end, phys_addr_t phys_addr, pgprot_t prot) +int ioremap_page_range(unsigned long addr, unsigned long end, + phys_addr_t phys_addr, pgprot_t prot) { - pgd_t *pgd; - unsigned long start; - unsigned long next; - int err; - - BUG_ON(addr >= end); - - start = addr; - phys_addr -= addr; - pgd = pgd_offset_k(addr); - do { - next = pgd_addr_end(addr, end); - err = ioremap_pud_range(pgd, addr, next, phys_addr+addr, prot); - if (err) - break; - } while (pgd++, addr = next, addr != end); + struct ioremap_data data = { .phys_addr = phys_addr, .prot = prot }; + int err = apply_to_page_range_batch(&init_mm, addr, end - addr, + ioremap_pte_range, &data); - flush_cache_vmap(start, end); + flush_cache_vmap(addr, end); return err; } _ Patches currently in -mm which might be from jeremy.fitzhardinge@xxxxxxxxxx are linux-next.patch vmalloc-use-plain-pte_clear-for-unmaps.patch vmalloc-use-apply_to_page_range_batch-for-vunmap_page_range.patch vmalloc-use-apply_to_page_range_batch-for-vmap_page_range_noflush.patch vmalloc-use-apply_to_page_range_batch-in-alloc_vm_area.patch xen-mmu-use-apply_to_page_range_batch-in-xen_remap_domain_mfn_range.patch xen-grant-table-use-apply_to_page_range_batch.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