memblock-reduce-number-of-parameters-in-for_each_mem_range.patch removed from -mm tree
The patch titled
Subject: memblock: reduce number of parameters in for_each_mem_range()
has been removed from the -mm tree. Its filename was
memblock-reduce-number-of-parameters-in-for_each_mem_range.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mike Rapoport <[email protected]>
Subject: memblock: reduce number of parameters in for_each_mem_range()
Currently for_each_mem_range() and for_each_mem_range_rev() iterators are the most generic way to traverse memblock regions. As such, they have 8 parameters and they are hardly convenient to users. Most users choose to utilize one of their wrappers and the only user that actually needs most of the parameters is memblock itself.
To avoid yet another naming for memblock iterators, rename the existing for_each_mem_range[_rev]() to __for_each_mem_range[_rev]() and add a new for_each_mem_range[_rev]() wrappers with only index, start and end parameters.
The new wrapper nicely fits into init_unavailable_mem() and will be used in upcoming changes to simplify memblock traversals.
---
.clang-format | 2 + arch/arm64/kernel/machine_kexec_file.c | 6 +-- arch/powerpc/kexec/file_load_64.c | 6 +-- include/linux/memblock.h | 41 +++++++++++++++++------ mm/page_alloc.c | 3 - 5 files changed, 38 insertions(+), 20 deletions(-)
arch/arm64/kernel/machine_kexec_file.c renamed from arch/arm64/kernel/machine_kexec_file.c~memblock-reduce-number-of-parameters-in-for_each_mem_range +2 -4
@@ -215,8 +215,7 @@ static int prepare_elf_headers(void **adphys_addr_t start, end; nr_ranges =1 ;/* for exclusion of crashkernel region */ -for_each_mem_range (i, &memblock.memory,NULL ,NUMA_NO_NODE , -MEMBLOCK_NONE , &start, &end,NULL ) +for_each_mem_range (i, &start, &end) nr_ranges++; cmem =kmalloc (struct_size (cmem, ranges, nr_ranges),GFP_KERNEL );
@@ -225,8 +224,7 @@ static int prepare_elf_headers(void **ad cmem->max_nr_ranges = nr_ranges; cmem->nr_ranges =0 ; -for_each_mem_range (i, &memblock.memory,NULL ,NUMA_NO_NODE , -MEMBLOCK_NONE , &start, &end,NULL ) { +for_each_mem_range (i, &start, &end) { cmem->ranges[cmem->nr_ranges].start = start; cmem->ranges[cmem->nr_ranges].end = end -1 ; cmem->nr_ranges++;
arch/powerpc/kexec/file_load_64.c renamed from arch/powerpc/kexec/file_load_64.c~memblock-reduce-number-of-parameters-in-for_each_mem_range +2 -4
@@ -250,8 +250,7 @@ static int __locate_mem_hole_top_down(stphys_addr_t start, end;u64 i; -for_each_mem_range_rev (i, &memblock.memory,NULL ,NUMA_NO_NODE , -MEMBLOCK_NONE , &start, &end,NULL ) { +for_each_mem_range_rev (i, &start, &end) {/* * memblock uses [start, end) convention while it is * [start, end] here. Fix the off-by-one to have the
@@ -350,8 +349,7 @@ static int __locate_mem_hole_bottom_up(sphys_addr_t start, end;u64 i; -for_each_mem_range (i, &memblock.memory,NULL ,NUMA_NO_NODE , -MEMBLOCK_NONE , &start, &end,NULL ) { +for_each_mem_range (i, &start, &end) {/* * memblock uses [start, end) convention while it is * [start, end] here. Fix the off-by-one to have the
.clang-format renamed from .clang-format~memblock-reduce-number-of-parameters-in-for_each_mem_range +2 -0
@@ -207,7 +207,9 @@ ForEachMacros: - 'for_each_memblock_type' - 'for_each_memcg_cache_index' - 'for_each_mem_pfn_range' + - '__for_each_mem_range' - 'for_each_mem_range' + - '__for_each_mem_range_rev' - 'for_each_mem_range_rev' - 'for_each_migratetype_order' - 'for_each_msi_entry'
include/linux/memblock.h renamed from include/linux/memblock.h~memblock-reduce-number-of-parameters-in-for_each_mem_range +31 -10
84 lines not on this page · raw message
mm/page_alloc.c renamed from mm/page_alloc.c~memblock-reduce-number-of-parameters-in-for_each_mem_range +1 -2
@@ -6990,8 +6990,7 @@ static void __init init_unavailable_mem(* Loop through unavailable ranges not covered by memblock.memory. */ pgcnt =0 ; -for_each_mem_range (i, &memblock.memory,NULL , -NUMA_NO_NODE ,MEMBLOCK_NONE , &start, &end,NULL ) { +for_each_mem_range (i, &start, &end) {if (next < start) pgcnt +=init_unavailable_range (PFN_DOWN (next),PFN_UP (start));
_
Patches currently in -mm which might be from [email protected] are
mm-remove-unused-early_pfn_valid.patch