Commit 7c2ee349 authored Oct 30, 2018 by Mike Rapoport Committed by Linus Torvalds Oct 31, 2018

memblock: rename __free_pages_bootmem to memblock_free_pages

The conversion is done using

sed -i 's@__free_pages_bootmem@memblock_free_pages@' \
    $(git grep -l __free_pages_bootmem)

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

mm/internal.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -161,7 +161,7 @@ static inline struct page *pageblock_pfn_to_page(unsigned long start_pfn,
		}

		extern int __isolate_free_page(struct page *page, unsigned int order);
		extern void __free_pages_bootmem(struct page *page, unsigned long pfn,
		extern void memblock_free_pages(struct page *page, unsigned long pfn,
		unsigned int order);
		extern void prep_compound_page(struct page *page, unsigned int order);
		extern void post_alloc_hook(struct page *page, unsigned int order,

mm/memblock.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1563,7 +1563,7 @@ void __init __memblock_free_late(phys_addr_t base, phys_addr_t size)
		end = PFN_DOWN(base + size);

		for (; cursor < end; cursor++) {
		__free_pages_bootmem(pfn_to_page(cursor), cursor, 0);
		memblock_free_pages(pfn_to_page(cursor), cursor, 0);
		totalram_pages++;
		}
		}

mm/nobootmem.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ static void __init __free_pages_memory(unsigned long start, unsigned long end)
		while (start + (1UL << order) > end)
		order--;

		__free_pages_bootmem(pfn_to_page(start), start, order);
		memblock_free_pages(pfn_to_page(start), start, order);

		start += (1UL << order);
		}

mm/page_alloc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1339,7 +1339,7 @@ meminit_pfn_in_nid(unsigned long pfn, int node,
		#endif


		void __init __free_pages_bootmem(struct page *page, unsigned long pfn,
		void __init memblock_free_pages(struct page *page, unsigned long pfn,
		unsigned int order)
		{
		if (early_page_uninitialised(pfn))

Admin message