Merge tag 'jfs-6.5' of github.com:kleikamp/linux-shaggy

[linux.git] / mm / sparse.c

diff --git a/mm/sparse.c b/mm/sparse.c
index c2afdb26039e58a9edc6a323304a7f5bb513d26f..297a8b772e8dcadb3ed69475340c1f91b403f917 100644 (file)
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -701,7 +701,7 @@ static int fill_subsection_map(unsigned long pfn, unsigned long nr_pages)
        return rc;
 }
 #else
-struct page * __meminit populate_section_memmap(unsigned long pfn,
+static struct page * __meminit populate_section_memmap(unsigned long pfn,
                unsigned long nr_pages, int nid, struct vmem_altmap *altmap,
                struct dev_pagemap *pgmap)
 {
@@ -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 */