hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mm/sparse.c: make sparse_init_one_section void and remove check 

sparse_init_one_section() is being called from two sites: sparse_init()
and sparse_add_one_section().  The former calls it from a
for_each_present_section_nr() loop, and the latter marks the section as
present before calling it.  This means that when
sparse_init_one_section() gets called, we already know that the section
is present.  So there is no point to double check that in the function.

This removes the check and makes the function void.

[ross.zwisler@linux.intel.com: fix error path in sparse_add_one_section]
  Link: http://lkml.kernel.org/r/20180706190658.6873-1-ross.zwisler@linux.intel.com
[ross.zwisler@linux.intel.com: simplification suggested by Oscar]
  Link: http://lkml.kernel.org/r/20180706223358.742-1-ross.zwisler@linux.intel.com
Link: http://lkml.kernel.org/r/20180702154325.12196-1-osalvador@techadventures.net
Signed-off-by: Oscar Salvador <osalvador@suse.de>
Acked-by: Michal Hocko <mhocko@suse.com>
Reviewed-by: Pavel Tatashin <pasha.tatashin@oracle.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Pasha Tatashin <Pavel.Tatashin@microsoft.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>
This commit is contained in:
Oscar Salvador 2018-08-17 15:47:14 -07:00 committed by Linus Torvalds
parent 29ef680ae7
commit 4e40987f12
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mm/sparse.c
View File

@ -257,19 +257,14 @@ struct page *sparse_decode_mem_map(unsigned long coded_mem_map, unsigned long pn
return ((struct page *)coded_mem_map) + section_nr_to_pfn(pnum); return ((struct page *)coded_mem_map) + section_nr_to_pfn(pnum);
} }
static int __meminit sparse_init_one_section(struct mem_section *ms, static void __meminit sparse_init_one_section(struct mem_section *ms,
unsigned long pnum, struct page *mem_map, unsigned long pnum, struct page *mem_map,
unsigned long *pageblock_bitmap) unsigned long *pageblock_bitmap)
{ {
if (!present_section(ms))
return -EINVAL;
ms->section_mem_map &= ~SECTION_MAP_MASK; ms->section_mem_map &= ~SECTION_MAP_MASK;
ms->section_mem_map |= sparse_encode_mem_map(mem_map, pnum) | ms->section_mem_map |= sparse_encode_mem_map(mem_map, pnum) |
SECTION_HAS_MEM_MAP; SECTION_HAS_MEM_MAP;
ms->pageblock_flags = pageblock_bitmap; ms->pageblock_flags = pageblock_bitmap;
return 1;
} }
unsigned long usemap_size(void) unsigned long usemap_size(void)
@ -760,6 +755,7 @@ int __meminit sparse_add_one_section(struct pglist_data *pgdat,
ret = sparse_index_init(section_nr, pgdat->node_id); ret = sparse_index_init(section_nr, pgdat->node_id);
if (ret < 0 && ret != -EEXIST) if (ret < 0 && ret != -EEXIST)
return ret; return ret;
ret = 0;
memmap = kmalloc_section_memmap(section_nr, pgdat->node_id, altmap); memmap = kmalloc_section_memmap(section_nr, pgdat->node_id, altmap);
if (!memmap) if (!memmap)
return -ENOMEM; return -ENOMEM;
@ -786,12 +782,11 @@ int __meminit sparse_add_one_section(struct pglist_data *pgdat,
#endif #endif
section_mark_present(ms); section_mark_present(ms);
sparse_init_one_section(ms, section_nr, memmap, usemap);
ret = sparse_init_one_section(ms, section_nr, memmap, usemap);
out: out:
pgdat_resize_unlock(pgdat, &flags); pgdat_resize_unlock(pgdat, &flags);
if (ret <= 0) { if (ret < 0) {
kfree(usemap); kfree(usemap);
__kfree_section_memmap(memmap, altmap); __kfree_section_memmap(memmap, altmap);
} }