Commit bc9331a1 authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds

mm: rename free_area_init_node() to free_area_init_memoryless_node()

free_area_init_node() is only used by x86 to initialize a memory-less
nodes.  Make its name reflect this and drop all the function parameters
except node ID as they are anyway zero.
Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Tested-by: Hoan Tran <hoan@os.amperecomputing.com>	[arm64]
Cc: Baoquan He <bhe@redhat.com>
Cc: Brian Cain <bcain@codeaurora.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greentime Hu <green.hu@gmail.com>
Cc: Greg Ungerer <gerg@linux-m68k.org>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: Guo Ren <guoren@kernel.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Helge Deller <deller@gmx.de>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Ley Foon Tan <ley.foon.tan@intel.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Nick Hu <nickhu@andestech.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rich Felker <dalias@libc.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Link: http://lkml.kernel.org/r/20200412194859.12663-19-rppt@kernel.orgSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 51930df5
...@@ -737,12 +737,9 @@ void __init x86_numa_init(void) ...@@ -737,12 +737,9 @@ void __init x86_numa_init(void)
static void __init init_memory_less_node(int nid) static void __init init_memory_less_node(int nid)
{ {
unsigned long zones_size[MAX_NR_ZONES] = {0};
unsigned long zholes_size[MAX_NR_ZONES] = {0};
/* Allocate and initialize node data. Memory-less node is now online.*/ /* Allocate and initialize node data. Memory-less node is now online.*/
alloc_node_data(nid); alloc_node_data(nid);
free_area_init_node(nid, zones_size, 0, zholes_size); free_area_init_memoryless_node(nid);
/* /*
* All zonelists will be built later in start_kernel() after per cpu * All zonelists will be built later in start_kernel() after per cpu
......
...@@ -2329,8 +2329,7 @@ static inline spinlock_t *pud_lock(struct mm_struct *mm, pud_t *pud) ...@@ -2329,8 +2329,7 @@ static inline spinlock_t *pud_lock(struct mm_struct *mm, pud_t *pud)
} }
extern void __init pagecache_init(void); extern void __init pagecache_init(void);
extern void __init free_area_init_node(int nid, unsigned long * zones_size, extern void __init free_area_init_memoryless_node(int nid);
unsigned long zone_start_pfn, unsigned long *zholes_size);
extern void free_initmem(void); extern void free_initmem(void);
/* /*
...@@ -2402,10 +2401,8 @@ static inline unsigned long get_num_physpages(void) ...@@ -2402,10 +2401,8 @@ static inline unsigned long get_num_physpages(void)
/* /*
* Using memblock node mappings, an architecture may initialise its * Using memblock node mappings, an architecture may initialise its
* zones, allocate the backing mem_map and account for memory holes in a more * zones, allocate the backing mem_map and account for memory holes in an
* architecture independent manner. This is a substitute for creating the * architecture independent manner.
* zone_sizes[] and zholes_size[] arrays and passing them to
* free_area_init_node()
* *
* An architecture is expected to register range of page frames backed by * An architecture is expected to register range of page frames backed by
* physical memory with memblock_add[_node]() before calling * physical memory with memblock_add[_node]() before calling
......
...@@ -6974,12 +6974,9 @@ static void __init __free_area_init_node(int nid, unsigned long *zones_size, ...@@ -6974,12 +6974,9 @@ static void __init __free_area_init_node(int nid, unsigned long *zones_size,
free_area_init_core(pgdat); free_area_init_core(pgdat);
} }
void __init free_area_init_node(int nid, unsigned long *zones_size, void __init free_area_init_memoryless_node(int nid)
unsigned long node_start_pfn,
unsigned long *zholes_size)
{ {
__free_area_init_node(nid, zones_size, node_start_pfn, zholes_size, __free_area_init_node(nid, NULL, 0, NULL, false);
true);
} }
#if !defined(CONFIG_FLAT_NODE_MEM_MAP) #if !defined(CONFIG_FLAT_NODE_MEM_MAP)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment