Skip to content

Commit 15c3c11

Browse files
rppttorvalds
rppt
authored and
torvalds
committed
memblock: replace alloc_bootmem_pages with memblock_alloc
The alloc_bootmem_pages() function allocates PAGE_SIZE aligned memory. memblock_alloc() with alignment set to PAGE_SIZE does exactly the same thing. The conversion is done using the following semantic patch: @@ expression e; @@ - alloc_bootmem_pages(e) + memblock_alloc(e, PAGE_SIZE) Link: http://lkml.kernel.org/r/1536927045-23536-20-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 e8625dc commit 15c3c11

File tree

10 files changed

+16
-13
lines changed

10 files changed

+16
-13
lines changed

‎arch/c6x/mm/init.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ void __init paging_init(void)
3838
struct pglist_data *pgdat = NODE_DATA(0);
3939
unsigned long zones_size[MAX_NR_ZONES] = {0, };
4040

41-
empty_zero_page = (unsigned long) alloc_bootmem_pages(PAGE_SIZE);
41+
empty_zero_page = (unsigned long) memblock_alloc(PAGE_SIZE,
42+
PAGE_SIZE);
4243
memset((void *)empty_zero_page, 0, PAGE_SIZE);
4344

4445
/*

‎arch/h8300/mm/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void __init paging_init(void)
6767
* Initialize the bad page table and bad page to point
6868
* to a couple of allocated pages.
6969
*/
70-
empty_zero_page = (unsigned long)alloc_bootmem_pages(PAGE_SIZE);
70+
empty_zero_page = (unsigned long)memblock_alloc(PAGE_SIZE, PAGE_SIZE);
7171
memset((void *)empty_zero_page, 0, PAGE_SIZE);
7272

7373
/*

‎arch/m68k/mm/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ void __init paging_init(void)
9393

9494
high_memory = (void *) end_mem;
9595

96-
empty_zero_page = alloc_bootmem_pages(PAGE_SIZE);
96+
empty_zero_page = memblock_alloc(PAGE_SIZE, PAGE_SIZE);
9797

9898
/*
9999
* Set up SFC/DFC registers (user data space).

‎arch/m68k/mm/mcfmmu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ void __init paging_init(void)
4444
enum zone_type zone;
4545
int i;
4646

47-
empty_zero_page = (void *) alloc_bootmem_pages(PAGE_SIZE);
47+
empty_zero_page = (void *) memblock_alloc(PAGE_SIZE, PAGE_SIZE);
4848
memset((void *) empty_zero_page, 0, PAGE_SIZE);
4949

5050
pg_dir = swapper_pg_dir;
5151
memset(swapper_pg_dir, 0, sizeof(swapper_pg_dir));
5252

5353
size = num_pages * sizeof(pte_t);
5454
size = (size + PAGE_SIZE) & ~(PAGE_SIZE-1);
55-
next_pgtable = (unsigned long) alloc_bootmem_pages(size);
55+
next_pgtable = (unsigned long) memblock_alloc(size, PAGE_SIZE);
5656

5757
bootmem_end = (next_pgtable + size + PAGE_SIZE) & PAGE_MASK;
5858
pg_dir += PAGE_OFFSET >> PGDIR_SHIFT;

‎arch/m68k/mm/motorola.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ void __init paging_init(void)
276276
* initialize the bad page table and bad page to point
277277
* to a couple of allocated pages
278278
*/
279-
empty_zero_page = alloc_bootmem_pages(PAGE_SIZE);
279+
empty_zero_page = memblock_alloc(PAGE_SIZE, PAGE_SIZE);
280280

281281
/*
282282
* Set up SFC/DFC registers

‎arch/m68k/mm/sun3mmu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void __init paging_init(void)
4545
unsigned long zones_size[MAX_NR_ZONES] = { 0, };
4646
unsigned long size;
4747

48-
empty_zero_page = alloc_bootmem_pages(PAGE_SIZE);
48+
empty_zero_page = memblock_alloc(PAGE_SIZE, PAGE_SIZE);
4949

5050
address = PAGE_OFFSET;
5151
pg_dir = swapper_pg_dir;
@@ -55,7 +55,7 @@ void __init paging_init(void)
5555
size = num_pages * sizeof(pte_t);
5656
size = (size + PAGE_SIZE) & ~(PAGE_SIZE-1);
5757

58-
next_pgtable = (unsigned long)alloc_bootmem_pages(size);
58+
next_pgtable = (unsigned long)memblock_alloc(size, PAGE_SIZE);
5959
bootmem_end = (next_pgtable + size + PAGE_SIZE) & PAGE_MASK;
6060

6161
/* Map whole memory from PAGE_OFFSET (0x0E000000) */

‎arch/sh/mm/init.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ static pmd_t * __init one_md_table_init(pud_t *pud)
128128
if (pud_none(*pud)) {
129129
pmd_t *pmd;
130130

131-
pmd = alloc_bootmem_pages(PAGE_SIZE);
131+
pmd = memblock_alloc(PAGE_SIZE, PAGE_SIZE);
132132
pud_populate(&init_mm, pud, pmd);
133133
BUG_ON(pmd != pmd_offset(pud, 0));
134134
}
@@ -141,7 +141,7 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
141141
if (pmd_none(*pmd)) {
142142
pte_t *pte;
143143

144-
pte = alloc_bootmem_pages(PAGE_SIZE);
144+
pte = memblock_alloc(PAGE_SIZE, PAGE_SIZE);
145145
pmd_populate_kernel(&init_mm, pmd, pte);
146146
BUG_ON(pte != pte_offset_kernel(pmd, 0));
147147
}

‎arch/x86/kernel/apic/io_apic.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2621,7 +2621,8 @@ void __init io_apic_init_mappings(void)
26212621
#ifdef CONFIG_X86_32
26222622
fake_ioapic_page:
26232623
#endif
2624-
ioapic_phys = (unsigned long)alloc_bootmem_pages(PAGE_SIZE);
2624+
ioapic_phys = (unsigned long)memblock_alloc(PAGE_SIZE,
2625+
PAGE_SIZE);
26252626
ioapic_phys = __pa(ioapic_phys);
26262627
}
26272628
set_fixmap_nocache(idx, ioapic_phys);

‎arch/x86/mm/init_64.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ static __ref void *spp_getpage(void)
197197
if (after_bootmem)
198198
ptr = (void *) get_zeroed_page(GFP_ATOMIC);
199199
else
200-
ptr = alloc_bootmem_pages(PAGE_SIZE);
200+
ptr = memblock_alloc(PAGE_SIZE, PAGE_SIZE);
201201

202202
if (!ptr || ((unsigned long)ptr & ~PAGE_MASK)) {
203203
panic("set_pte_phys: cannot allocate page data %s\n",

‎drivers/xen/swiotlb-xen.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,8 @@ int __ref xen_swiotlb_init(int verbose, bool early)
217217
* Get IO TLB memory from any location.
218218
*/
219219
if (early)
220-
xen_io_tlb_start = alloc_bootmem_pages(PAGE_ALIGN(bytes));
220+
xen_io_tlb_start = memblock_alloc(PAGE_ALIGN(bytes),
221+
PAGE_SIZE);
221222
else {
222223
#define SLABS_PER_PAGE (1 << (PAGE_SHIFT - IO_TLB_SHIFT))
223224
#define IO_TLB_MIN_SLABS ((1<<20) >> IO_TLB_SHIFT)

0 commit comments

Comments
 (0)