From: Mike Rapoport <rppt@linux.vnet.ibm.com> To: linux-mm@kvack.org Cc: Andrew Morton <akpm@linux-foundation.org>, "David S. Miller" <davem@davemloft.net>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Ingo Molnar <mingo@redhat.com>, Michael Ellerman <mpe@ellerman.id.au>, Michal Hocko <mhocko@suse.com>, Paul Burton <paul.burton@mips.com>, Thomas Gleixner <tglx@linutronix.de>, Tony Luck <tony.luck@intel.com>, linux-ia64@vger.kernel.org, linux-mips@linux-mips.org, linuxppc-dev@lists.ozlabs.org, sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org, Mike Rapoport <rppt@linux.vnet.ibm.com> Subject: [RFC PATCH 26/29] memblock: rename __free_pages_bootmem to memblock_free_pages Date: Wed, 5 Sep 2018 18:59:41 +0300 [thread overview] Message-ID: <1536163184-26356-27-git-send-email-rppt@linux.vnet.ibm.com> (raw) In-Reply-To: <1536163184-26356-1-git-send-email-rppt@linux.vnet.ibm.com> The conversion is done using sed -i 's@__free_pages_bootmem@memblock_free_pages@' \ $(git grep -l __free_pages_bootmem) Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com> --- mm/internal.h | 2 +- mm/memblock.c | 2 +- mm/nobootmem.c | 2 +- mm/page_alloc.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 87256ae..291eb2b 100644 --- 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 index 63df68b..55d7d50 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1639,7 +1639,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 index bb64b09..9608bc5 100644 --- 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 index 33c9e27..e143fae 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1333,7 +1333,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)) -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Mike Rapoport <rppt@linux.vnet.ibm.com> To: linux-mm@kvack.org Cc: Andrew Morton <akpm@linux-foundation.org>, "David S. Miller" <davem@davemloft.net>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Ingo Molnar <mingo@redhat.com>, Michael Ellerman <mpe@ellerman.id.au>, Michal Hocko <mhocko@suse.com>, Paul Burton <paul.burton@mips.com>, Thomas Gleixner <tglx@linutronix.de>, Tony Luck <tony.luck@intel.com>, linux-ia64@vger.kernel.org, linux-mips@linux-mips.org, linuxppc-dev@lists.ozlabs.org, sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org, Mike Rapoport <rppt@linux.vnet.ibm.com> Subject: [RFC PATCH 26/29] memblock: rename __free_pages_bootmem to memblock_free_pages Date: Wed, 05 Sep 2018 15:59:41 +0000 [thread overview] Message-ID: <1536163184-26356-27-git-send-email-rppt@linux.vnet.ibm.com> (raw) In-Reply-To: <1536163184-26356-1-git-send-email-rppt@linux.vnet.ibm.com> The conversion is done using sed -i 's@__free_pages_bootmem@memblock_free_pages@' \ $(git grep -l __free_pages_bootmem) Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com> --- mm/internal.h | 2 +- mm/memblock.c | 2 +- mm/nobootmem.c | 2 +- mm/page_alloc.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 87256ae..291eb2b 100644 --- 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 index 63df68b..55d7d50 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1639,7 +1639,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 index bb64b09..9608bc5 100644 --- 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 index 33c9e27..e143fae 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1333,7 +1333,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)) -- 2.7.4
next prev parent reply other threads:[~2018-09-05 16:01 UTC|newest] Thread overview: 167+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-05 15:59 [RFC PATCH 00/29] mm: remove bootmem allocator Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-05 15:59 ` [RFC PATCH 01/29] mips: switch to NO_BOOTMEM Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-05 15:59 ` [RFC PATCH 02/29] mm: remove CONFIG_NO_BOOTMEM Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-05 15:59 ` [RFC PATCH 03/29] mm: remove CONFIG_HAVE_MEMBLOCK Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-19 9:04 ` Jonathan Cameron 2018-09-19 9:04 ` Jonathan Cameron 2018-09-19 9:04 ` Jonathan Cameron 2018-09-19 10:34 ` Mike Rapoport 2018-09-19 10:34 ` Mike Rapoport 2018-09-19 10:34 ` Mike Rapoport 2018-09-19 10:34 ` Mike Rapoport 2018-09-19 10:45 ` Jonathan Cameron 2018-09-19 10:45 ` Jonathan Cameron 2018-09-19 10:45 ` Jonathan Cameron 2018-09-19 10:55 ` Mike Rapoport 2018-09-19 10:55 ` Mike Rapoport 2018-09-05 15:59 ` [RFC PATCH 04/29] mm: remove bootmem allocator implementation Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-06 7:30 ` Michal Hocko 2018-09-06 7:30 ` Michal Hocko 2018-09-06 8:31 ` Michal Hocko 2018-09-06 8:31 ` Michal Hocko 2018-09-05 15:59 ` [RFC PATCH 05/29] mm: nobootmem: remove dead code Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-05 15:59 ` [RFC PATCH 06/29] memblock: rename memblock_alloc{_nid,_try_nid} to memblock_phys_alloc* Mike Rapoport 2018-09-05 15:59 ` [RFC PATCH 06/29] memblock: rename memblock_alloc{_nid, _try_nid} " Mike Rapoport 2018-09-05 15:59 ` [RFC PATCH 06/29] memblock: rename memblock_alloc{_nid,_try_nid} " Mike Rapoport 2018-09-06 7:35 ` Michal Hocko 2018-09-06 7:35 ` [RFC PATCH 06/29] memblock: rename memblock_alloc{_nid, _try_nid} " Michal Hocko 2018-09-06 7:35 ` [RFC PATCH 06/29] memblock: rename memblock_alloc{_nid,_try_nid} " Michal Hocko 2018-09-05 15:59 ` [RFC PATCH 07/29] memblock: remove _virt from APIs returning virtual address Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-05 17:04 ` Rob Herring 2018-09-05 17:04 ` Rob Herring 2018-09-05 17:20 ` Mike Rapoport 2018-09-05 17:20 ` Mike Rapoport 2018-09-06 7:28 ` Michal Hocko 2018-09-06 7:28 ` Michal Hocko 2018-09-06 12:43 ` Mike Rapoport 2018-09-06 12:43 ` Mike Rapoport 2018-09-06 13:01 ` Michal Hocko 2018-09-06 13:01 ` Michal Hocko 2018-09-06 13:39 ` Mike Rapoport 2018-09-06 13:39 ` Mike Rapoport 2018-09-06 13:46 ` Michal Hocko 2018-09-06 13:46 ` Michal Hocko 2018-09-07 8:42 ` Mike Rapoport 2018-09-07 8:42 ` Mike Rapoport 2018-09-07 8:47 ` Michal Hocko 2018-09-07 8:47 ` Michal Hocko 2018-09-07 9:19 ` Mike Rapoport 2018-09-07 9:19 ` Mike Rapoport 2018-09-05 15:59 ` [RFC PATCH 08/29] memblock: replace alloc_bootmem_align with memblock_alloc Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-06 7:39 ` Michal Hocko 2018-09-06 7:39 ` Michal Hocko 2018-09-05 15:59 ` [RFC PATCH 09/29] memblock: replace alloc_bootmem_low with memblock_alloc_low Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-06 7:41 ` Michal Hocko 2018-09-06 7:41 ` Michal Hocko 2018-09-05 15:59 ` [RFC PATCH 10/29] memblock: replace __alloc_bootmem_node_nopanic with memblock_alloc_try_nid_nopanic Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-06 7:49 ` Michal Hocko 2018-09-06 7:49 ` [RFC PATCH 10/29] memblock: replace __alloc_bootmem_node_nopanic with memblock_alloc_try_nid_nop Michal Hocko 2018-09-05 15:59 ` [RFC PATCH 11/29] memblock: replace alloc_bootmem_pages_nopanic with memblock_alloc_nopanic Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-06 7:53 ` Michal Hocko 2018-09-06 7:53 ` Michal Hocko 2018-09-05 15:59 ` [RFC PATCH 12/29] memblock: replace alloc_bootmem_low with memblock_alloc_low Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-06 7:55 ` Michal Hocko 2018-09-06 7:55 ` Michal Hocko 2018-09-05 15:59 ` [RFC PATCH 13/29] memblock: replace __alloc_bootmem_nopanic with memblock_alloc_from_nopanic Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-06 7:57 ` Michal Hocko 2018-09-06 7:57 ` Michal Hocko 2018-09-06 12:44 ` Mike Rapoport 2018-09-06 12:44 ` Mike Rapoport 2018-09-05 15:59 ` [RFC PATCH 14/29] memblock: add align parameter to memblock_alloc_node() Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-06 8:06 ` Michal Hocko 2018-09-06 8:06 ` Michal Hocko 2018-09-06 12:49 ` Mike Rapoport 2018-09-06 12:49 ` Mike Rapoport 2018-09-05 15:59 ` [RFC PATCH 15/29] memblock: replace alloc_bootmem_pages_node with memblock_alloc_node Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-06 8:08 ` Michal Hocko 2018-09-06 8:08 ` Michal Hocko 2018-09-05 15:59 ` [RFC PATCH 16/29] memblock: replace __alloc_bootmem_node with appropriate memblock_ API Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-06 8:38 ` Michal Hocko 2018-09-06 8:38 ` Michal Hocko 2018-09-06 12:50 ` Mike Rapoport 2018-09-06 12:50 ` Mike Rapoport 2018-09-05 15:59 ` [RFC PATCH 17/29] memblock: replace alloc_bootmem_node with memblock_alloc_node Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-06 8:41 ` Michal Hocko 2018-09-06 8:41 ` Michal Hocko 2018-09-05 15:59 ` [RFC PATCH 18/29] memblock: replace alloc_bootmem_low_pages with memblock_alloc_low Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-06 8:43 ` Michal Hocko 2018-09-06 8:43 ` Michal Hocko 2018-09-05 15:59 ` [RFC PATCH 19/29] memblock: replace alloc_bootmem_pages with memblock_alloc Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-06 8:44 ` Michal Hocko 2018-09-06 8:44 ` Michal Hocko 2018-09-05 15:59 ` [RFC PATCH 20/29] memblock: replace __alloc_bootmem with memblock_alloc_from Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-06 8:52 ` Michal Hocko 2018-09-06 8:52 ` Michal Hocko 2018-09-06 12:58 ` Mike Rapoport 2018-09-06 12:58 ` Mike Rapoport 2018-09-05 15:59 ` [RFC PATCH 21/29] memblock: replace alloc_bootmem with memblock_alloc Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-06 8:55 ` Michal Hocko 2018-09-06 8:55 ` Michal Hocko 2018-09-06 13:14 ` Mike Rapoport 2018-09-06 13:14 ` Mike Rapoport 2018-09-05 15:59 ` [RFC PATCH 22/29] mm: nobootmem: remove bootmem allocation APIs Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-06 8:56 ` Michal Hocko 2018-09-06 8:56 ` Michal Hocko 2018-09-05 15:59 ` [RFC PATCH 23/29] memblock: replace free_bootmem{_node} with memblock_free Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-06 8:57 ` Michal Hocko 2018-09-06 8:57 ` Michal Hocko 2018-09-05 15:59 ` [RFC PATCH 24/29] memblock: replace free_bootmem_late with memblock_free_late Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-06 9:02 ` Michal Hocko 2018-09-06 9:02 ` Michal Hocko 2018-09-05 15:59 ` [RFC PATCH 25/29] memblock: rename free_all_bootmem to memblock_free_all Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-06 9:04 ` Michal Hocko 2018-09-06 9:04 ` Michal Hocko 2018-09-05 15:59 ` Mike Rapoport [this message] 2018-09-05 15:59 ` [RFC PATCH 26/29] memblock: rename __free_pages_bootmem to memblock_free_pages Mike Rapoport 2018-09-06 9:06 ` Michal Hocko 2018-09-06 9:06 ` Michal Hocko 2018-09-05 15:59 ` [RFC PATCH 27/29] mm: remove nobootmem Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-06 9:08 ` Michal Hocko 2018-09-06 9:08 ` Michal Hocko 2018-09-05 15:59 ` [RFC PATCH 28/29] memblock: replace BOOTMEM_ALLOC_* with MEMBLOCK variants Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-06 9:08 ` Michal Hocko 2018-09-06 9:08 ` Michal Hocko 2018-09-05 15:59 ` [RFC PATCH 29/29] mm: remove include/linux/bootmem.h Mike Rapoport 2018-09-05 15:59 ` Mike Rapoport 2018-09-06 2:33 ` [RFC PATCH 00/29] mm: remove bootmem allocator Greentime Hu 2018-09-06 2:33 ` Greentime Hu 2018-09-06 2:33 ` Greentime Hu 2018-09-06 13:30 ` Mike Rapoport 2018-09-06 13:30 ` Mike Rapoport 2018-09-06 13:30 ` Mike Rapoport 2018-09-06 9:15 ` Michal Hocko 2018-09-06 9:15 ` Michal Hocko 2018-09-06 13:04 ` Pasha Tatashin 2018-09-06 13:04 ` Pasha Tatashin 2018-09-06 13:04 ` Pasha Tatashin 2018-09-06 13:21 ` Mike Rapoport 2018-09-06 13:21 ` Mike Rapoport 2018-09-06 13:16 ` Mike Rapoport 2018-09-06 13:16 ` Mike Rapoport
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1536163184-26356-27-git-send-email-rppt@linux.vnet.ibm.com \ --to=rppt@linux.vnet.ibm.com \ --cc=akpm@linux-foundation.org \ --cc=davem@davemloft.net \ --cc=gregkh@linuxfoundation.org \ --cc=linux-ia64@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mips@linux-mips.org \ --cc=linux-mm@kvack.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mhocko@suse.com \ --cc=mingo@redhat.com \ --cc=mpe@ellerman.id.au \ --cc=paul.burton@mips.com \ --cc=sparclinux@vger.kernel.org \ --cc=tglx@linutronix.de \ --cc=tony.luck@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.