| Message ID | 1536163184-26356-19-git-send-email-rppt@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | mm: remove bootmem allocator | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | warning | next/apply_patch Patch failed to apply |
| snowpatch_ozlabs/apply_patch | fail | Failed to apply to any branch |
On Wed 05-09-18 18:59:33, Mike Rapoport wrote: > The conversion is done using the following semantic patch: > > @@ > expression e; > @@ > - alloc_bootmem_low_pages(e) > + memblock_alloc_low(e, PAGE_SIZE) > > Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com> Again, I trust Coccinelle to do the right thing and from a quick glance it looks sane (modulo _virt naming) Acked-by: Michal Hocko <mhocko@suse.com> > --- > arch/arc/mm/highmem.c | 2 +- > arch/m68k/atari/stram.c | 3 ++- > arch/m68k/mm/motorola.c | 5 +++-- > arch/mips/cavium-octeon/dma-octeon.c | 2 +- > arch/mips/mm/init.c | 3 ++- > arch/um/kernel/mem.c | 10 ++++++---- > arch/xtensa/mm/mmu.c | 2 +- > 7 files changed, 16 insertions(+), 11 deletions(-) > > diff --git a/arch/arc/mm/highmem.c b/arch/arc/mm/highmem.c > index 77ff64a..f582dc8 100644 > --- a/arch/arc/mm/highmem.c > +++ b/arch/arc/mm/highmem.c > @@ -123,7 +123,7 @@ static noinline pte_t * __init alloc_kmap_pgtable(unsigned long kvaddr) > pud_k = pud_offset(pgd_k, kvaddr); > pmd_k = pmd_offset(pud_k, kvaddr); > > - pte_k = (pte_t *)alloc_bootmem_low_pages(PAGE_SIZE); > + pte_k = (pte_t *)memblock_alloc_low(PAGE_SIZE, PAGE_SIZE); > pmd_populate_kernel(&init_mm, pmd_k, pte_k); > return pte_k; > } > diff --git a/arch/m68k/atari/stram.c b/arch/m68k/atari/stram.c > index c83d664..1089d67 100644 > --- a/arch/m68k/atari/stram.c > +++ b/arch/m68k/atari/stram.c > @@ -95,7 +95,8 @@ void __init atari_stram_reserve_pages(void *start_mem) > { > if (kernel_in_stram) { > pr_debug("atari_stram pool: kernel in ST-RAM, using alloc_bootmem!\n"); > - stram_pool.start = (resource_size_t)alloc_bootmem_low_pages(pool_size); > + stram_pool.start = (resource_size_t)memblock_alloc_low(pool_size, > + PAGE_SIZE); > stram_pool.end = stram_pool.start + pool_size - 1; > request_resource(&iomem_resource, &stram_pool); > stram_virt_offset = 0; > diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c > index 4e17ecb..8bcf57e 100644 > --- a/arch/m68k/mm/motorola.c > +++ b/arch/m68k/mm/motorola.c > @@ -55,7 +55,7 @@ static pte_t * __init kernel_page_table(void) > { > pte_t *ptablep; > > - ptablep = (pte_t *)alloc_bootmem_low_pages(PAGE_SIZE); > + ptablep = (pte_t *)memblock_alloc_low(PAGE_SIZE, PAGE_SIZE); > > clear_page(ptablep); > __flush_page_to_ram(ptablep); > @@ -95,7 +95,8 @@ static pmd_t * __init kernel_ptr_table(void) > > last_pgtable += PTRS_PER_PMD; > if (((unsigned long)last_pgtable & ~PAGE_MASK) == 0) { > - last_pgtable = (pmd_t *)alloc_bootmem_low_pages(PAGE_SIZE); > + last_pgtable = (pmd_t *)memblock_alloc_low(PAGE_SIZE, > + PAGE_SIZE); > > clear_page(last_pgtable); > __flush_page_to_ram(last_pgtable); > diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c > index 236833b..c44c1a6 100644 > --- a/arch/mips/cavium-octeon/dma-octeon.c > +++ b/arch/mips/cavium-octeon/dma-octeon.c > @@ -244,7 +244,7 @@ void __init plat_swiotlb_setup(void) > swiotlb_nslabs = ALIGN(swiotlb_nslabs, IO_TLB_SEGSIZE); > swiotlbsize = swiotlb_nslabs << IO_TLB_SHIFT; > > - octeon_swiotlb = alloc_bootmem_low_pages(swiotlbsize); > + octeon_swiotlb = memblock_alloc_low(swiotlbsize, PAGE_SIZE); > > if (swiotlb_init_with_tbl(octeon_swiotlb, swiotlb_nslabs, 1) == -ENOMEM) > panic("Cannot allocate SWIOTLB buffer"); > diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c > index 400676c..a010fba7 100644 > --- a/arch/mips/mm/init.c > +++ b/arch/mips/mm/init.c > @@ -244,7 +244,8 @@ void __init fixrange_init(unsigned long start, unsigned long end, > pmd = (pmd_t *)pud; > for (; (k < PTRS_PER_PMD) && (vaddr < end); pmd++, k++) { > if (pmd_none(*pmd)) { > - pte = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE); > + pte = (pte_t *) memblock_alloc_low(PAGE_SIZE, > + PAGE_SIZE); > set_pmd(pmd, __pmd((unsigned long)pte)); > BUG_ON(pte != pte_offset_kernel(pmd, 0)); > } > diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c > index 3c0e470..185f6bb 100644 > --- a/arch/um/kernel/mem.c > +++ b/arch/um/kernel/mem.c > @@ -64,7 +64,8 @@ void __init mem_init(void) > static void __init one_page_table_init(pmd_t *pmd) > { > if (pmd_none(*pmd)) { > - pte_t *pte = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE); > + pte_t *pte = (pte_t *) memblock_alloc_low(PAGE_SIZE, > + PAGE_SIZE); > set_pmd(pmd, __pmd(_KERNPG_TABLE + > (unsigned long) __pa(pte))); > if (pte != pte_offset_kernel(pmd, 0)) > @@ -75,7 +76,7 @@ static void __init one_page_table_init(pmd_t *pmd) > static void __init one_md_table_init(pud_t *pud) > { > #ifdef CONFIG_3_LEVEL_PGTABLES > - pmd_t *pmd_table = (pmd_t *) alloc_bootmem_low_pages(PAGE_SIZE); > + pmd_t *pmd_table = (pmd_t *) memblock_alloc_low(PAGE_SIZE, PAGE_SIZE); > set_pud(pud, __pud(_KERNPG_TABLE + (unsigned long) __pa(pmd_table))); > if (pmd_table != pmd_offset(pud, 0)) > BUG(); > @@ -124,7 +125,7 @@ static void __init fixaddr_user_init( void) > return; > > fixrange_init( FIXADDR_USER_START, FIXADDR_USER_END, swapper_pg_dir); > - v = (unsigned long) alloc_bootmem_low_pages(size); > + v = (unsigned long) memblock_alloc_low(size, PAGE_SIZE); > memcpy((void *) v , (void *) FIXADDR_USER_START, size); > p = __pa(v); > for ( ; size > 0; size -= PAGE_SIZE, vaddr += PAGE_SIZE, > @@ -143,7 +144,8 @@ void __init paging_init(void) > unsigned long zones_size[MAX_NR_ZONES], vaddr; > int i; > > - empty_zero_page = (unsigned long *) alloc_bootmem_low_pages(PAGE_SIZE); > + empty_zero_page = (unsigned long *) memblock_alloc_low(PAGE_SIZE, > + PAGE_SIZE); > for (i = 0; i < ARRAY_SIZE(zones_size); i++) > zones_size[i] = 0; > > diff --git a/arch/xtensa/mm/mmu.c b/arch/xtensa/mm/mmu.c > index 9d1ecfc..f33a1ff 100644 > --- a/arch/xtensa/mm/mmu.c > +++ b/arch/xtensa/mm/mmu.c > @@ -31,7 +31,7 @@ static void * __init init_pmd(unsigned long vaddr, unsigned long n_pages) > pr_debug("%s: vaddr: 0x%08lx, n_pages: %ld\n", > __func__, vaddr, n_pages); > > - pte = alloc_bootmem_low_pages(n_pages * sizeof(pte_t)); > + pte = memblock_alloc_low(n_pages * sizeof(pte_t), PAGE_SIZE); > > for (i = 0; i < n_pages; ++i) > pte_clear(NULL, 0, pte + i); > -- > 2.7.4 >
diff --git a/arch/arc/mm/highmem.c b/arch/arc/mm/highmem.c index 77ff64a..f582dc8 100644 --- a/arch/arc/mm/highmem.c +++ b/arch/arc/mm/highmem.c @@ -123,7 +123,7 @@ static noinline pte_t * __init alloc_kmap_pgtable(unsigned long kvaddr) pud_k = pud_offset(pgd_k, kvaddr); pmd_k = pmd_offset(pud_k, kvaddr); - pte_k = (pte_t *)alloc_bootmem_low_pages(PAGE_SIZE); + pte_k = (pte_t *)memblock_alloc_low(PAGE_SIZE, PAGE_SIZE); pmd_populate_kernel(&init_mm, pmd_k, pte_k); return pte_k; } diff --git a/arch/m68k/atari/stram.c b/arch/m68k/atari/stram.c index c83d664..1089d67 100644 --- a/arch/m68k/atari/stram.c +++ b/arch/m68k/atari/stram.c @@ -95,7 +95,8 @@ void __init atari_stram_reserve_pages(void *start_mem) { if (kernel_in_stram) { pr_debug("atari_stram pool: kernel in ST-RAM, using alloc_bootmem!\n"); - stram_pool.start = (resource_size_t)alloc_bootmem_low_pages(pool_size); + stram_pool.start = (resource_size_t)memblock_alloc_low(pool_size, + PAGE_SIZE); stram_pool.end = stram_pool.start + pool_size - 1; request_resource(&iomem_resource, &stram_pool); stram_virt_offset = 0; diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c index 4e17ecb..8bcf57e 100644 --- a/arch/m68k/mm/motorola.c +++ b/arch/m68k/mm/motorola.c @@ -55,7 +55,7 @@ static pte_t * __init kernel_page_table(void) { pte_t *ptablep; - ptablep = (pte_t *)alloc_bootmem_low_pages(PAGE_SIZE); + ptablep = (pte_t *)memblock_alloc_low(PAGE_SIZE, PAGE_SIZE); clear_page(ptablep); __flush_page_to_ram(ptablep); @@ -95,7 +95,8 @@ static pmd_t * __init kernel_ptr_table(void) last_pgtable += PTRS_PER_PMD; if (((unsigned long)last_pgtable & ~PAGE_MASK) == 0) { - last_pgtable = (pmd_t *)alloc_bootmem_low_pages(PAGE_SIZE); + last_pgtable = (pmd_t *)memblock_alloc_low(PAGE_SIZE, + PAGE_SIZE); clear_page(last_pgtable); __flush_page_to_ram(last_pgtable); diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c index 236833b..c44c1a6 100644 --- a/arch/mips/cavium-octeon/dma-octeon.c +++ b/arch/mips/cavium-octeon/dma-octeon.c @@ -244,7 +244,7 @@ void __init plat_swiotlb_setup(void) swiotlb_nslabs = ALIGN(swiotlb_nslabs, IO_TLB_SEGSIZE); swiotlbsize = swiotlb_nslabs << IO_TLB_SHIFT; - octeon_swiotlb = alloc_bootmem_low_pages(swiotlbsize); + octeon_swiotlb = memblock_alloc_low(swiotlbsize, PAGE_SIZE); if (swiotlb_init_with_tbl(octeon_swiotlb, swiotlb_nslabs, 1) == -ENOMEM) panic("Cannot allocate SWIOTLB buffer"); diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index 400676c..a010fba7 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c @@ -244,7 +244,8 @@ void __init fixrange_init(unsigned long start, unsigned long end, pmd = (pmd_t *)pud; for (; (k < PTRS_PER_PMD) && (vaddr < end); pmd++, k++) { if (pmd_none(*pmd)) { - pte = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE); + pte = (pte_t *) memblock_alloc_low(PAGE_SIZE, + PAGE_SIZE); set_pmd(pmd, __pmd((unsigned long)pte)); BUG_ON(pte != pte_offset_kernel(pmd, 0)); } diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c index 3c0e470..185f6bb 100644 --- a/arch/um/kernel/mem.c +++ b/arch/um/kernel/mem.c @@ -64,7 +64,8 @@ void __init mem_init(void) static void __init one_page_table_init(pmd_t *pmd) { if (pmd_none(*pmd)) { - pte_t *pte = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE); + pte_t *pte = (pte_t *) memblock_alloc_low(PAGE_SIZE, + PAGE_SIZE); set_pmd(pmd, __pmd(_KERNPG_TABLE + (unsigned long) __pa(pte))); if (pte != pte_offset_kernel(pmd, 0)) @@ -75,7 +76,7 @@ static void __init one_page_table_init(pmd_t *pmd) static void __init one_md_table_init(pud_t *pud) { #ifdef CONFIG_3_LEVEL_PGTABLES - pmd_t *pmd_table = (pmd_t *) alloc_bootmem_low_pages(PAGE_SIZE); + pmd_t *pmd_table = (pmd_t *) memblock_alloc_low(PAGE_SIZE, PAGE_SIZE); set_pud(pud, __pud(_KERNPG_TABLE + (unsigned long) __pa(pmd_table))); if (pmd_table != pmd_offset(pud, 0)) BUG(); @@ -124,7 +125,7 @@ static void __init fixaddr_user_init( void) return; fixrange_init( FIXADDR_USER_START, FIXADDR_USER_END, swapper_pg_dir); - v = (unsigned long) alloc_bootmem_low_pages(size); + v = (unsigned long) memblock_alloc_low(size, PAGE_SIZE); memcpy((void *) v , (void *) FIXADDR_USER_START, size); p = __pa(v); for ( ; size > 0; size -= PAGE_SIZE, vaddr += PAGE_SIZE, @@ -143,7 +144,8 @@ void __init paging_init(void) unsigned long zones_size[MAX_NR_ZONES], vaddr; int i; - empty_zero_page = (unsigned long *) alloc_bootmem_low_pages(PAGE_SIZE); + empty_zero_page = (unsigned long *) memblock_alloc_low(PAGE_SIZE, + PAGE_SIZE); for (i = 0; i < ARRAY_SIZE(zones_size); i++) zones_size[i] = 0; diff --git a/arch/xtensa/mm/mmu.c b/arch/xtensa/mm/mmu.c index 9d1ecfc..f33a1ff 100644 --- a/arch/xtensa/mm/mmu.c +++ b/arch/xtensa/mm/mmu.c @@ -31,7 +31,7 @@ static void * __init init_pmd(unsigned long vaddr, unsigned long n_pages) pr_debug("%s: vaddr: 0x%08lx, n_pages: %ld\n", __func__, vaddr, n_pages); - pte = alloc_bootmem_low_pages(n_pages * sizeof(pte_t)); + pte = memblock_alloc_low(n_pages * sizeof(pte_t), PAGE_SIZE); for (i = 0; i < n_pages; ++i) pte_clear(NULL, 0, pte + i);
The conversion is done using the following semantic patch: @@ expression e; @@ - alloc_bootmem_low_pages(e) + memblock_alloc_low(e, PAGE_SIZE) Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com> --- arch/arc/mm/highmem.c | 2 +- arch/m68k/atari/stram.c | 3 ++- arch/m68k/mm/motorola.c | 5 +++-- arch/mips/cavium-octeon/dma-octeon.c | 2 +- arch/mips/mm/init.c | 3 ++- arch/um/kernel/mem.c | 10 ++++++---- arch/xtensa/mm/mmu.c | 2 +- 7 files changed, 16 insertions(+), 11 deletions(-)