Skip to content

Commit e8625dc

Browse files
rppttorvalds
rppt
authored and
torvalds
committed
memblock: replace alloc_bootmem_low_pages with memblock_alloc_low
The alloc_bootmem_low_pages() function allocates PAGE_SIZE aligned regions from low memory. memblock_alloc_low() with alignment set to PAGE_SIZE does exactly the same thing. The conversion is done using the following semantic patch: @@ expression e; @@ - alloc_bootmem_low_pages(e) + memblock_alloc_low(e, PAGE_SIZE) Link: http://lkml.kernel.org/r/1536927045-23536-19-git-send-email-rppt@linux.vnet.ibm.com Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com> Acked-by: Michal Hocko <mhocko@suse.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Chris Zankel <chris@zankel.net> Cc: "David S. Miller" <davem@davemloft.net> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Greentime Hu <green.hu@gmail.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Guan Xuetao <gxt@pku.edu.cn> Cc: Ingo Molnar <mingo@redhat.com> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org> Cc: Jonas Bonn <jonas@southpole.se> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Ley Foon Tan <lftan@altera.com> Cc: Mark Salter <msalter@redhat.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Matt Turner <mattst88@gmail.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michal Simek <monstr@monstr.eu> Cc: Palmer Dabbelt <palmer@sifive.com> Cc: Paul Burton <paul.burton@mips.com> Cc: Richard Kuo <rkuo@codeaurora.org> Cc: Richard Weinberger <richard@nod.at> Cc: Rich Felker <dalias@libc.org> Cc: Russell King <linux@armlinux.org.uk> Cc: Serge Semin <fancer.lancer@gmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tony Luck <tony.luck@intel.com> Cc: Vineet Gupta <vgupta@synopsys.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 3bb1f80 commit e8625dc

File tree

7 files changed

+16
-11
lines changed

7 files changed

+16
-11
lines changed

‎arch/arc/mm/highmem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ static noinline pte_t * __init alloc_kmap_pgtable(unsigned long kvaddr)
123123
pud_k = pud_offset(pgd_k, kvaddr);
124124
pmd_k = pmd_offset(pud_k, kvaddr);
125125

126-
pte_k = (pte_t *)alloc_bootmem_low_pages(PAGE_SIZE);
126+
pte_k = (pte_t *)memblock_alloc_low(PAGE_SIZE, PAGE_SIZE);
127127
pmd_populate_kernel(&init_mm, pmd_k, pte_k);
128128
return pte_k;
129129
}

‎arch/m68k/atari/stram.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ void __init atari_stram_reserve_pages(void *start_mem)
9595
{
9696
if (kernel_in_stram) {
9797
pr_debug("atari_stram pool: kernel in ST-RAM, using alloc_bootmem!\n");
98-
stram_pool.start = (resource_size_t)alloc_bootmem_low_pages(pool_size);
98+
stram_pool.start = (resource_size_t)memblock_alloc_low(pool_size,
99+
PAGE_SIZE);
99100
stram_pool.end = stram_pool.start + pool_size - 1;
100101
request_resource(&iomem_resource, &stram_pool);
101102
stram_virt_offset = 0;

‎arch/m68k/mm/motorola.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static pte_t * __init kernel_page_table(void)
5555
{
5656
pte_t *ptablep;
5757

58-
ptablep = (pte_t *)alloc_bootmem_low_pages(PAGE_SIZE);
58+
ptablep = (pte_t *)memblock_alloc_low(PAGE_SIZE, PAGE_SIZE);
5959

6060
clear_page(ptablep);
6161
__flush_page_to_ram(ptablep);
@@ -95,7 +95,8 @@ static pmd_t * __init kernel_ptr_table(void)
9595

9696
last_pgtable += PTRS_PER_PMD;
9797
if (((unsigned long)last_pgtable & ~PAGE_MASK) == 0) {
98-
last_pgtable = (pmd_t *)alloc_bootmem_low_pages(PAGE_SIZE);
98+
last_pgtable = (pmd_t *)memblock_alloc_low(PAGE_SIZE,
99+
PAGE_SIZE);
99100

100101
clear_page(last_pgtable);
101102
__flush_page_to_ram(last_pgtable);

‎arch/mips/cavium-octeon/dma-octeon.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ void __init plat_swiotlb_setup(void)
244244
swiotlb_nslabs = ALIGN(swiotlb_nslabs, IO_TLB_SEGSIZE);
245245
swiotlbsize = swiotlb_nslabs << IO_TLB_SHIFT;
246246

247-
octeon_swiotlb = alloc_bootmem_low_pages(swiotlbsize);
247+
octeon_swiotlb = memblock_alloc_low(swiotlbsize, PAGE_SIZE);
248248

249249
if (swiotlb_init_with_tbl(octeon_swiotlb, swiotlb_nslabs, 1) == -ENOMEM)
250250
panic("Cannot allocate SWIOTLB buffer");

‎arch/mips/mm/init.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,8 @@ void __init fixrange_init(unsigned long start, unsigned long end,
243243
pmd = (pmd_t *)pud;
244244
for (; (k < PTRS_PER_PMD) && (vaddr < end); pmd++, k++) {
245245
if (pmd_none(*pmd)) {
246-
pte = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);
246+
pte = (pte_t *) memblock_alloc_low(PAGE_SIZE,
247+
PAGE_SIZE);
247248
set_pmd(pmd, __pmd((unsigned long)pte));
248249
BUG_ON(pte != pte_offset_kernel(pmd, 0));
249250
}

‎arch/um/kernel/mem.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ void __init mem_init(void)
6464
static void __init one_page_table_init(pmd_t *pmd)
6565
{
6666
if (pmd_none(*pmd)) {
67-
pte_t *pte = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);
67+
pte_t *pte = (pte_t *) memblock_alloc_low(PAGE_SIZE,
68+
PAGE_SIZE);
6869
set_pmd(pmd, __pmd(_KERNPG_TABLE +
6970
(unsigned long) __pa(pte)));
7071
if (pte != pte_offset_kernel(pmd, 0))
@@ -75,7 +76,7 @@ static void __init one_page_table_init(pmd_t *pmd)
7576
static void __init one_md_table_init(pud_t *pud)
7677
{
7778
#ifdef CONFIG_3_LEVEL_PGTABLES
78-
pmd_t *pmd_table = (pmd_t *) alloc_bootmem_low_pages(PAGE_SIZE);
79+
pmd_t *pmd_table = (pmd_t *) memblock_alloc_low(PAGE_SIZE, PAGE_SIZE);
7980
set_pud(pud, __pud(_KERNPG_TABLE + (unsigned long) __pa(pmd_table)));
8081
if (pmd_table != pmd_offset(pud, 0))
8182
BUG();
@@ -124,7 +125,7 @@ static void __init fixaddr_user_init( void)
124125
return;
125126

126127
fixrange_init( FIXADDR_USER_START, FIXADDR_USER_END, swapper_pg_dir);
127-
v = (unsigned long) alloc_bootmem_low_pages(size);
128+
v = (unsigned long) memblock_alloc_low(size, PAGE_SIZE);
128129
memcpy((void *) v , (void *) FIXADDR_USER_START, size);
129130
p = __pa(v);
130131
for ( ; size > 0; size -= PAGE_SIZE, vaddr += PAGE_SIZE,
@@ -143,7 +144,8 @@ void __init paging_init(void)
143144
unsigned long zones_size[MAX_NR_ZONES], vaddr;
144145
int i;
145146

146-
empty_zero_page = (unsigned long *) alloc_bootmem_low_pages(PAGE_SIZE);
147+
empty_zero_page = (unsigned long *) memblock_alloc_low(PAGE_SIZE,
148+
PAGE_SIZE);
147149
for (i = 0; i < ARRAY_SIZE(zones_size); i++)
148150
zones_size[i] = 0;
149151

‎arch/xtensa/mm/mmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ static void * __init init_pmd(unsigned long vaddr, unsigned long n_pages)
3131
pr_debug("%s: vaddr: 0x%08lx, n_pages: %ld\n",
3232
__func__, vaddr, n_pages);
3333

34-
pte = alloc_bootmem_low_pages(n_pages * sizeof(pte_t));
34+
pte = memblock_alloc_low(n_pages * sizeof(pte_t), PAGE_SIZE);
3535

3636
for (i = 0; i < n_pages; ++i)
3737
pte_clear(NULL, 0, pte + i);

0 commit comments

Comments
 (0)