* [PATCH v4 1/2] mm/sparse: Clean up the obsolete code comment
@ 2019-03-29 14:42 Baoquan He
2019-03-29 14:42 ` [PATCH v4 2/2] drivers/base/memory.c: Clean up relicts in function parameters Baoquan He
0 siblings, 1 reply; 2+ messages in thread
From: Baoquan He @ 2019-03-29 14:42 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-mm, akpm, willy, Baoquan He
The code comment above sparse_add_one_section() is obsolete and
incorrect, clean it up and write new one.
Signed-off-by: Baoquan He <bhe@redhat.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Reviewed-by: Oscar Salvador <osalvador@suse.de>
Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>
Reviewed-by: Mike Rapoport <rppt@linux.ibm.com>
---
v3->v4:
Improve the doc format further.
mm/sparse.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/mm/sparse.c b/mm/sparse.c
index 69904aa6165b..cb448c8bb46c 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -684,10 +684,18 @@ static void free_map_bootmem(struct page *memmap)
#endif /* CONFIG_MEMORY_HOTREMOVE */
#endif /* CONFIG_SPARSEMEM_VMEMMAP */
-/*
- * returns the number of sections whose mem_maps were properly
- * set. If this is <=0, then that means that the passed-in
- * map was not consumed and must be freed.
+/**
+ * sparse_add_one_section - add a memory section
+ * @nid: The node to add section on
+ * @start_pfn: start pfn of the memory range
+ * @altmap: device page map
+ *
+ * This is only intended for hotplug.
+ *
+ * Return:
+ * * 0 - On success.
+ * * -EEXIST - Section has been present.
+ * * -ENOMEM - Out of memory.
*/
int __meminit sparse_add_one_section(int nid, unsigned long start_pfn,
struct vmem_altmap *altmap)
--
2.17.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH v4 2/2] drivers/base/memory.c: Clean up relicts in function parameters
2019-03-29 14:42 [PATCH v4 1/2] mm/sparse: Clean up the obsolete code comment Baoquan He
@ 2019-03-29 14:42 ` Baoquan He
0 siblings, 0 replies; 2+ messages in thread
From: Baoquan He @ 2019-03-29 14:42 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-mm, akpm, willy, Baoquan He
The input parameter 'phys_index' of memory_block_action() is actually
the section number, but not the phys_index of memory_block. This is
a relict from the past when one memory block could only contain one
section. Rename it to start_section_nr.
And also in remove_memory_section(), the 'node_id' and 'phys_device'
are not used by anyone. Remove them.
Signed-off-by: Baoquan He <bhe@redhat.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>
Reviewed-by: Oscar Salvador <osalvador@suse.de>
---
v3->v4:
Remove useless parameters in remove_memory_section().
drivers/base/memory.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index cb8347500ce2..d9ebb89816f7 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -231,13 +231,14 @@ static bool pages_correctly_probed(unsigned long start_pfn)
* OK to have direct references to sparsemem variables in here.
*/
static int
-memory_block_action(unsigned long phys_index, unsigned long action, int online_type)
+memory_block_action(unsigned long start_section_nr, unsigned long action,
+ int online_type)
{
unsigned long start_pfn;
unsigned long nr_pages = PAGES_PER_SECTION * sections_per_block;
int ret;
- start_pfn = section_nr_to_pfn(phys_index);
+ start_pfn = section_nr_to_pfn(start_section_nr);
switch (action) {
case MEM_ONLINE:
@@ -251,7 +252,7 @@ memory_block_action(unsigned long phys_index, unsigned long action, int online_t
break;
default:
WARN(1, KERN_WARNING "%s(%ld, %ld) unknown action: "
- "%ld\n", __func__, phys_index, action, action);
+ "%ld\n", __func__, start_section_nr, action, action);
ret = -EINVAL;
}
@@ -738,8 +739,7 @@ unregister_memory(struct memory_block *memory)
device_unregister(&memory->dev);
}
-static int remove_memory_section(unsigned long node_id,
- struct mem_section *section, int phys_device)
+static int remove_memory_section(struct mem_section *section)
{
struct memory_block *mem;
@@ -771,7 +771,7 @@ int unregister_memory_section(struct mem_section *section)
if (!present_section(section))
return -EINVAL;
- return remove_memory_section(0, section, 0);
+ return remove_memory_section(section);
}
#endif /* CONFIG_MEMORY_HOTREMOVE */
--
2.17.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-03-29 14:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-29 14:42 [PATCH v4 1/2] mm/sparse: Clean up the obsolete code comment Baoquan He
2019-03-29 14:42 ` [PATCH v4 2/2] drivers/base/memory.c: Clean up relicts in function parameters Baoquan He
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).