The patch titled
Subject: drivers/base/memory.c: clean up relics in function parameters
has been added to the -mm tree. Its filename is
drivers-base-memoryc-clean-up-relicts-in-function-parameters.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/drivers-base-memoryc-clean-up-relicts-in-function-parameters.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/drivers-base-memoryc-clean-up-relicts-in-function-parameters.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: Baoquan He <bhe@xxxxxxxxxx>
Subject: drivers/base/memory.c: clean up relics in function parameters
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 relic
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'
arguments are not used by anyone. Remove them.
Link: http://lkml.kernel.org/r/20190329144250.14315-2-bhe@xxxxxxxxxx
Signed-off-by: Baoquan He <bhe@xxxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
Reviewed-by: Mukesh Ojha <mojha@xxxxxxxxxxxxxx>
Reviewed-by: Oscar Salvador <osalvador@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/base/memory.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
--- a/drivers/base/memory.c~drivers-base-memoryc-clean-up-relicts-in-function-parameters
+++ a/drivers/base/memory.c
@@ -231,13 +231,14 @@ static bool pages_correctly_probed(unsig
* 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_i
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 *m
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
if (!present_section(section))
return -EINVAL;
- return remove_memory_section(0, section, 0);
+ return remove_memory_section(section);
}
#endif /* CONFIG_MEMORY_HOTREMOVE */
_
Patches currently in -mm which might be from bhe@xxxxxxxxxx are
mm-memory_hotplug-fix-the-wrong-usage-of-n_high_memory.patch
mm-sparse-clean-up-the-obsolete-code-comment.patch
drivers-base-memoryc-clean-up-relicts-in-function-parameters.patch
