tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Yajun Deng and committed by
Andrew Morton bd5f79ab 061e62e8

+10 -23
+2 -3
include/linux/memory_hotplug.h
··· 344 344 extern int sparse_add_section(int nid, unsigned long pfn, 345 345 unsigned long nr_pages, struct vmem_altmap *altmap, 346 346 struct dev_pagemap *pgmap); 347 - extern void sparse_remove_section(struct mem_section *ms, 348 - unsigned long pfn, unsigned long nr_pages, 349 - unsigned long map_offset, struct vmem_altmap *altmap); 347 + extern void sparse_remove_section(unsigned long pfn, unsigned long nr_pages, 348 + struct vmem_altmap *altmap); 350 349 extern struct page *sparse_decode_mem_map(unsigned long coded_mem_map, 351 350 unsigned long pnum); 352 351 extern struct zone *zone_for_pfn_range(int online_type, int nid,
+1 -17
mm/memory_hotplug.c
··· 492 492 set_zone_contiguous(zone); 493 493 } 494 494 495 - static void __remove_section(unsigned long pfn, unsigned long nr_pages, 496 - unsigned long map_offset, 497 - struct vmem_altmap *altmap) 498 - { 499 - struct mem_section *ms = __pfn_to_section(pfn); 500 - 501 - if (WARN_ON_ONCE(!valid_section(ms))) 502 - return; 503 - 504 - sparse_remove_section(ms, pfn, nr_pages, map_offset, altmap); 505 - } 506 - 507 495 /** 508 496 * __remove_pages() - remove sections of pages 509 497 * @pfn: starting pageframe (must be aligned to start of a section) ··· 508 520 { 509 521 const unsigned long end_pfn = pfn + nr_pages; 510 522 unsigned long cur_nr_pages; 511 - unsigned long map_offset = 0; 512 - 513 - map_offset = vmem_altmap_offset(altmap); 514 523 515 524 if (check_pfn_span(pfn, nr_pages)) { 516 525 WARN(1, "Misaligned %s start: %#lx end: %#lx\n", __func__, pfn, pfn + nr_pages - 1); ··· 519 534 /* Select all remaining pages up to the next section boundary */ 520 535 cur_nr_pages = min(end_pfn - pfn, 521 536 SECTION_ALIGN_UP(pfn + 1) - pfn); 522 - __remove_section(pfn, cur_nr_pages, map_offset, altmap); 523 - map_offset = 0; 537 + sparse_remove_section(pfn, cur_nr_pages, altmap); 524 538 } 525 539 } 526 540
+7 -3
mm/sparse.c
··· 922 922 return 0; 923 923 } 924 924 925 - void sparse_remove_section(struct mem_section *ms, unsigned long pfn, 926 - unsigned long nr_pages, unsigned long map_offset, 927 - struct vmem_altmap *altmap) 925 + void sparse_remove_section(unsigned long pfn, unsigned long nr_pages, 926 + struct vmem_altmap *altmap) 928 927 { 928 + struct mem_section *ms = __pfn_to_section(pfn); 929 + 930 + if (WARN_ON_ONCE(!valid_section(ms))) 931 + return; 932 + 929 933 section_deactivate(pfn, nr_pages, altmap); 930 934 } 931 935 #endif /* CONFIG_MEMORY_HOTPLUG */