Commit 2013288f authored Oct 30, 2018 by Mike Rapoport Committed by Linus Torvalds Oct 31, 2018

memblock: replace free_bootmem{_node} with memblock_free

The free_bootmem and free_bootmem_node are merely wrappers for
memblock_free. Replace their usage with a call to memblock_free using the
following semantic patch:

@@
expression e1, e2, e3;
@@
(
- free_bootmem(e1, e2)
+ memblock_free(e1, e2)
|
- free_bootmem_node(e1, e2, e3)
+ memblock_free(e2, e3)
)

Link: http://lkml.kernel.org/r/1536927045-23536-24-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>

parent 6c7835f8

arch/alpha/kernel/core_irongate.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -234,8 +234,7 @@ albacore_init_arch(void)
		unsigned long size;

		size = initrd_end - initrd_start;
		free_bootmem_node(NODE_DATA(0), __pa(initrd_start),
		PAGE_ALIGN(size));
		memblock_free(__pa(initrd_start), PAGE_ALIGN(size));
		if (!move_initrd(pci_mem))
		printk("irongate_init_arch: initrd too big "
		"(%ldK)\ndisabling initrd\n",

arch/arm64/mm/init.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -536,7 +536,7 @@ static inline void free_memmap(unsigned long start_pfn, unsigned long end_pfn)
		* memmap array.
		*/
		if (pg < pgend)
		free_bootmem(pg, pgend - pg);
		memblock_free(pg, pgend - pg);
		}

		/*

arch/mips/kernel/setup.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -561,7 +561,7 @@ static void __init bootmem_init(void)
		extern void show_kernel_relocation(const char *level);

		offset = __pa_symbol(_text) - __pa_symbol(VMLINUX_LOAD_ADDRESS);
		free_bootmem(__pa_symbol(VMLINUX_LOAD_ADDRESS), offset);
		memblock_free(__pa_symbol(VMLINUX_LOAD_ADDRESS), offset);

		#if defined(CONFIG_DEBUG_KERNEL) && defined(CONFIG_DEBUG_INFO)
		/*

arch/powerpc/kernel/setup_64.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -771,7 +771,7 @@ static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, size_t align)

		static void __init pcpu_fc_free(void *ptr, size_t size)
		{
		free_bootmem(__pa(ptr), size);
		memblock_free(__pa(ptr), size);
		}

		static int pcpu_cpu_distance(unsigned int from, unsigned int to)

arch/sparc/kernel/smp_64.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1607,7 +1607,7 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, size_t size,

		static void __init pcpu_free_bootmem(void *ptr, size_t size)
		{
		free_bootmem(__pa(ptr), size);
		memblock_free(__pa(ptr), size);
		}

		static int __init pcpu_cpu_distance(unsigned int from, unsigned int to)

Admin message