Re: [RFC PATCH 26/29] memblock: rename __free_pages_bootmem to memblock_free_pages

Michal Hocko
2018-09-06T09:06:42Z

On Wed 05-09-18 18:59:41, Mike Rapoport wrote:
> 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>

Acked-by: Michal Hocko <mhocko@suse.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
>

--
Michal Hocko
SUSE Labs