mm-sparse-remove-unused-parameters-in-sparse_remove_section.patch removed from -mm tree
The quilt patch titled
Subject: mm/sparse: remove unused parameters in sparse_remove_section()
has been removed from the -mm tree. Its filename was
mm-sparse-remove-unused-parameters-in-sparse_remove_section.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Yajun Deng <[email protected]>
Subject: mm/sparse: remove unused parameters in sparse_remove_section()
Date: Wed, 7 Jun 2023 10:39:52 +0800
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().
---
include/linux/memory_hotplug.h | 5 ++--- mm/memory_hotplug.c | 18 +----------------- mm/sparse.c | 10 +++++++--- 3 files changed, 10 insertions(+), 23 deletions(-)
include/linux/memory_hotplug.h renamed from include/linux/memory_hotplug.h~mm-sparse-remove-unused-parameters-in-sparse_remove_section +2 -3
@@ -344,9 +344,8 @@ extern void remove_pfn_range_from_zone(sextern 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,
mm/memory_hotplug.c renamed from mm/memory_hotplug.c~mm-sparse-remove-unused-parameters-in-sparse_remove_section +1 -17
@@ -492,18 +492,6 @@ void __ref remove_pfn_range_from_zone(stset_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, u {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, u/* 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); } }
mm/sparse.c renamed from mm/sparse.c~mm-sparse-remove-unused-parameters-in-sparse_remove_section +7 -3
@@ -922,10 +922,14 @@ int __meminit sparse_add_section(int nid 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 */
_
Patches currently in -mm which might be from [email protected] are
dma-contiguous-support-per-numa-cma-for-all-architectures.patch