memblock: replace alloc_bootmem_pages with memblock_alloc (15c3c114) · Commits · 戴 / test

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>

arch/c6x/mm/init.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,8 @@ void __init paging_init(void)
		struct pglist_data *pgdat = NODE_DATA(0);
		unsigned long zones_size[MAX_NR_ZONES] = {0, };

		empty_zero_page = (unsigned long) alloc_bootmem_pages(PAGE_SIZE);
		empty_zero_page = (unsigned long) memblock_alloc(PAGE_SIZE,
		PAGE_SIZE);
		memset((void *)empty_zero_page, 0, PAGE_SIZE);

		/*

arch/h8300/mm/init.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ void __init paging_init(void)
		* Initialize the bad page table and bad page to point
		* to a couple of allocated pages.
		*/
		empty_zero_page = (unsigned long)alloc_bootmem_pages(PAGE_SIZE);
		empty_zero_page = (unsigned long)memblock_alloc(PAGE_SIZE, PAGE_SIZE);
		memset((void *)empty_zero_page, 0, PAGE_SIZE);

		/*

arch/m68k/mm/init.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -93,7 +93,7 @@ void __init paging_init(void)

		high_memory = (void *) end_mem;

		empty_zero_page = alloc_bootmem_pages(PAGE_SIZE);
		empty_zero_page = memblock_alloc(PAGE_SIZE, PAGE_SIZE);

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

arch/m68k/mm/mcfmmu.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ void __init paging_init(void)
		enum zone_type zone;
		int i;

		empty_zero_page = (void *) alloc_bootmem_pages(PAGE_SIZE);
		empty_zero_page = (void *) memblock_alloc(PAGE_SIZE, PAGE_SIZE);
		memset((void *) empty_zero_page, 0, PAGE_SIZE);

		pg_dir = swapper_pg_dir;
		@@ -52,7 +52,7 @@ void __init paging_init(void)

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

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

arch/m68k/mm/motorola.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -276,7 +276,7 @@ void __init paging_init(void)
		* initialize the bad page table and bad page to point
		* to a couple of allocated pages
		*/
		empty_zero_page = alloc_bootmem_pages(PAGE_SIZE);
		empty_zero_page = memblock_alloc(PAGE_SIZE, PAGE_SIZE);

		/*
		* Set up SFC/DFC registers

Admin message