The patch titled
Subject: mm/sparse.c: make sparse_init_one_section void and remove check
has been added to the -mm tree. Its filename is
mm-sparse-make-sparse_init_one_section-void-and-remove-check.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-sparse-make-sparse_init_one_section-void-and-remove-check.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-sparse-make-sparse_init_one_section-void-and-remove-check.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Oscar Salvador <osalvador@xxxxxxx>
Subject: 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.
Link: http://lkml.kernel.org/r/20180702154325.12196-1-osalvador@xxxxxxxxxxxxxxxxxx
Signed-off-by: Oscar Salvador <osalvador@xxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
Reviewed-by: Pavel Tatashin <pasha.tatashin@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/sparse.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff -puN mm/sparse.c~mm-sparse-make-sparse_init_one_section-void-and-remove-check mm/sparse.c
--- a/mm/sparse.c~mm-sparse-make-sparse_init_one_section-void-and-remove-check
+++ a/mm/sparse.c
@@ -257,19 +257,14 @@ struct page *sparse_decode_mem_map(unsig
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 *pageblock_bitmap)
{
- if (!present_section(ms))
- return -EINVAL;
-
ms->section_mem_map &= ~SECTION_MAP_MASK;
ms->section_mem_map |= sparse_encode_mem_map(mem_map, pnum) |
SECTION_HAS_MEM_MAP;
ms->pageblock_flags = pageblock_bitmap;
-
- return 1;
}
unsigned long usemap_size(void)
@@ -786,12 +781,11 @@ int __meminit sparse_add_one_section(str
#endif
section_mark_present(ms);
-
- ret = sparse_init_one_section(ms, section_nr, memmap, usemap);
+ sparse_init_one_section(ms, section_nr, memmap, usemap);
out:
pgdat_resize_unlock(pgdat, &flags);
- if (ret <= 0) {
+ if (ret < 0) {
kfree(usemap);
__kfree_section_memmap(memmap, altmap);
}
_
Patches currently in -mm which might be from osalvador@xxxxxxx are
mm-memory_hotplug-make-add_memory_resource-use-__try_online_node.patch
mm-memory_hotplug-call-register_mem_sect_under_node.patch
mm-memory_hotplug-make-register_mem_sect_under_node-a-cb-of-walk_memory_range.patch
mm-memory_hotplug-drop-unnecessary-checks-from-register_mem_sect_under_node.patch
mm-sparse-make-sparse_init_one_section-void-and-remove-check.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
