summaryrefslogtreecommitdiffstats
path: root/mm/sparse.c
diff options
context:
space:
mode:
authorWei Yang <richard.weiyang@gmail.com>2018-12-28 03:37:06 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2018-12-28 15:11:49 -0500
commit4e0d2e7ef14d9e1c900dac909db45263822b824f (patch)
treec4c0bde18e2a745fb13ef562dd864d2cef1f8dbc /mm/sparse.c
parent83af658898cb292a32d8b6cd9b51266d7cfc4b6a (diff)
mm, sparse: pass nid instead of pgdat to sparse_add_one_section()
Since the information needed in sparse_add_one_section() is node id to allocate proper memory, it is not necessary to pass its pgdat. This patch changes the prototype of sparse_add_one_section() to pass node id directly. This is intended to reduce misleading that sparse_add_one_section() would touch pgdat. Link: http://lkml.kernel.org/r/20181204085657.20472-2-richard.weiyang@gmail.com Signed-off-by: Wei Yang <richard.weiyang@gmail.com> Reviewed-by: David Hildenbrand <david@redhat.com> Acked-by: Michal Hocko <mhocko@suse.com> Cc: Dave Hansen <dave.hansen@intel.com> Cc: Oscar Salvador <osalvador@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/sparse.c')
-rw-r--r--mm/sparse.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/sparse.c b/mm/sparse.c
index 7323a03fbc39..7ea5dc6c6b19 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -678,8 +678,8 @@ static void free_map_bootmem(struct page *memmap)
678 * set. If this is <=0, then that means that the passed-in 678 * set. If this is <=0, then that means that the passed-in
679 * map was not consumed and must be freed. 679 * map was not consumed and must be freed.
680 */ 680 */
681int __meminit sparse_add_one_section(struct pglist_data *pgdat, 681int __meminit sparse_add_one_section(int nid, unsigned long start_pfn,
682 unsigned long start_pfn, struct vmem_altmap *altmap) 682 struct vmem_altmap *altmap)
683{ 683{
684 unsigned long section_nr = pfn_to_section_nr(start_pfn); 684 unsigned long section_nr = pfn_to_section_nr(start_pfn);
685 struct mem_section *ms; 685 struct mem_section *ms;
@@ -691,11 +691,11 @@ int __meminit sparse_add_one_section(struct pglist_data *pgdat,
691 * no locking for this, because it does its own 691 * no locking for this, because it does its own
692 * plus, it does a kmalloc 692 * plus, it does a kmalloc
693 */ 693 */
694 ret = sparse_index_init(section_nr, pgdat->node_id); 694 ret = sparse_index_init(section_nr, nid);
695 if (ret < 0 && ret != -EEXIST) 695 if (ret < 0 && ret != -EEXIST)
696 return ret; 696 return ret;
697 ret = 0; 697 ret = 0;
698 memmap = kmalloc_section_memmap(section_nr, pgdat->node_id, altmap); 698 memmap = kmalloc_section_memmap(section_nr, nid, altmap);
699 if (!memmap) 699 if (!memmap)
700 return -ENOMEM; 700 return -ENOMEM;
701 usemap = __kmalloc_section_usemap(); 701 usemap = __kmalloc_section_usemap();