memblock: rename __free_pages_bootmem to memblock_free_pages

rppt · torvalds · commit 7c2ee349cf79 · 2018-10-31T08:54:16.000-07:00
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>
diff --git a/mm/internal.h b/mm/internal.h
@@ -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,
diff --git a/mm/memblock.c b/mm/memblock.c
@@ -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++;
 	}
 }
diff --git a/mm/nobootmem.c b/mm/nobootmem.c
@@ -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);
 	}
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
@@ -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))

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ static inline struct page *pageblock_pfn_to_page(unsigned long start_pfn,`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`extern int __isolate_free_page(struct page *page, unsigned int order);`
`164`		`-extern void __free_pages_bootmem(struct page *page, unsigned long pfn,`
	`164`	`+extern void memblock_free_pages(struct page *page, unsigned long pfn,`
`165`	`165`	`unsigned int order);`
`166`	`166`	`extern void prep_compound_page(struct page *page, unsigned int order);`
`167`	`167`	`extern void post_alloc_hook(struct page *page, unsigned int order,`
Original file line number	Diff line number	Diff line change
`@@ -1563,7 +1563,7 @@ void __init __memblock_free_late(phys_addr_t base, phys_addr_t size)`
`1563`	`1563`	`end = PFN_DOWN(base + size);`
`1564`	`1564`
`1565`	`1565`	`for (; cursor < end; cursor++) {`
`1566`		`- __free_pages_bootmem(pfn_to_page(cursor), cursor, 0);`
	`1566`	`+ memblock_free_pages(pfn_to_page(cursor), cursor, 0);`
`1567`	`1567`	`totalram_pages++;`
`1568`	`1568`	`}`
`1569`	`1569`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ static void __init __free_pages_memory(unsigned long start, unsigned long end)`
`43`	`43`	`while (start + (1UL << order) > end)`
`44`	`44`	`order--;`
`45`	`45`
`46`		`- __free_pages_bootmem(pfn_to_page(start), start, order);`
	`46`	`+ memblock_free_pages(pfn_to_page(start), start, order);`
`47`	`47`
`48`	`48`	`start += (1UL << order);`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1339,7 +1339,7 @@ meminit_pfn_in_nid(unsigned long pfn, int node,`
`1339`	`1339`	`#endif`
`1340`	`1340`
`1341`	`1341`
`1342`		`-void __init __free_pages_bootmem(struct page *page, unsigned long pfn,`
	`1342`	`+void __init memblock_free_pages(struct page *page, unsigned long pfn,`
`1343`	`1343`	`unsigned int order)`
`1344`	`1344`	`{`
`1345`	`1345`	`if (early_page_uninitialised(pfn))`