mm/sparse: remove unused parameters in sparse_remove_section()

These parameters ms and map_offset are not used in
sparse_remove_section(), so remove them.

The __remove_section() is only called by __remove_pages(), remove it.  And
put the WARN_ON_ONCE() in sparse_remove_section().

Link: https://lkml.kernel.org/r/20230607023952.2247489-1-yajun.deng@linux.dev
Signed-off-by: Yajun Deng <yajun.deng@linux.dev>
Reviewed-by: David Hildenbrand <david@redhat.com>
Cc: Oscar Salvador <osalvador@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 04bc286eed42cd0cef3cda18efaa23a4768f0e5a..013c69753c9173b1aead87e40f363a773c1115a7 100644 (file)
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -344,9 +344,8 @@ extern void remove_pfn_range_from_zone(struct zone *zone,
 extern int sparse_add_section(int nid, unsigned long pfn,
                unsigned long nr_pages, struct vmem_altmap *altmap,
                struct dev_pagemap *pgmap);
-extern void sparse_remove_section(struct mem_section *ms,
-               unsigned long pfn, unsigned long nr_pages,
-               unsigned long map_offset, struct vmem_altmap *altmap);
+extern void sparse_remove_section(unsigned long pfn, unsigned long nr_pages,
+                                 struct vmem_altmap *altmap);
 extern struct page *sparse_decode_mem_map(unsigned long coded_mem_map,
                                          unsigned long pnum);
 extern struct zone *zone_for_pfn_range(int online_type, int nid,

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 9061ac69b1b6075704089229b4ffe085175f3d3e..8877734b5f2f0b48afd2968dde13723537bc6cf0 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -492,18 +492,6 @@ void __ref remove_pfn_range_from_zone(struct zone *zone,
        set_zone_contiguous(zone);
 }
 
-static void __remove_section(unsigned long pfn, unsigned long nr_pages,
-                            unsigned long map_offset,
-                            struct vmem_altmap *altmap)
-{
-       struct mem_section *ms = __pfn_to_section(pfn);
-
-       if (WARN_ON_ONCE(!valid_section(ms)))
-               return;
-
-       sparse_remove_section(ms, pfn, nr_pages, map_offset, altmap);
-}
-
 /**
  * __remove_pages() - remove sections of pages
  * @pfn: starting pageframe (must be aligned to start of a section)
@@ -520,9 +508,6 @@ void __remove_pages(unsigned long pfn, unsigned long nr_pages,
 {
        const unsigned long end_pfn = pfn + nr_pages;
        unsigned long cur_nr_pages;
-       unsigned long map_offset = 0;
-
-       map_offset = vmem_altmap_offset(altmap);
 
        if (check_pfn_span(pfn, nr_pages)) {
                WARN(1, "Misaligned %s start: %#lx end: %#lx\n", __func__, pfn, pfn + nr_pages - 1);
@@ -534,8 +519,7 @@ void __remove_pages(unsigned long pfn, unsigned long nr_pages,
                /* Select all remaining pages up to the next section boundary */
                cur_nr_pages = min(end_pfn - pfn,
                                   SECTION_ALIGN_UP(pfn + 1) - pfn);
-               __remove_section(pfn, cur_nr_pages, map_offset, altmap);
-               map_offset = 0;
+               sparse_remove_section(pfn, cur_nr_pages, altmap);
        }
 }
 

diff --git a/mm/sparse.c b/mm/sparse.c
index c2afdb26039e58a9edc6a323304a7f5bb513d26f..7a29e10193fe6b20976d725ae2424eda581140a8 100644 (file)
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -922,10 +922,14 @@ int __meminit sparse_add_section(int nid, unsigned long start_pfn,
        return 0;
 }
 
-void sparse_remove_section(struct mem_section *ms, unsigned long pfn,
-               unsigned long nr_pages, unsigned long map_offset,
-               struct vmem_altmap *altmap)
+void sparse_remove_section(unsigned long pfn, unsigned long nr_pages,
+                          struct vmem_altmap *altmap)
 {
+       struct mem_section *ms = __pfn_to_section(pfn);
+
+       if (WARN_ON_ONCE(!valid_section(ms)))
+               return;
+
        section_deactivate(pfn, nr_pages, altmap);
 }
 #endif /* CONFIG_MEMORY_HOTPLUG */