On Fri, Aug 25, 2023 at 12:18:34PM +0100, Usama Arif wrote:
> This allows setting flags to both memblock types and is in preparation for
> setting flags (for e.g. to not initialize struct pages) on reserved
> memory region.
>
> Signed-off-by: Usama Arif <usama.arif@xxxxxxxxxxxxx>
Reviewed-by: Mike Rapoport (IBM) <rppt@xxxxxxxxxx>
> ---
> mm/memblock.c | 15 +++++++--------
> 1 file changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/mm/memblock.c b/mm/memblock.c
> index f9e61e565a53..43cb4404d94c 100644
> --- a/mm/memblock.c
> +++ b/mm/memblock.c
> @@ -896,10 +896,9 @@ int __init_memblock memblock_physmem_add(phys_addr_t base, phys_addr_t size)
> *
> * Return: 0 on success, -errno on failure.
> */
> -static int __init_memblock memblock_setclr_flag(phys_addr_t base,
> - phys_addr_t size, int set, int flag)
> +static int __init_memblock memblock_setclr_flag(struct memblock_type *type,
> + phys_addr_t base, phys_addr_t size, int set, int flag)
> {
> - struct memblock_type *type = &memblock.memory;
> int i, ret, start_rgn, end_rgn;
>
> ret = memblock_isolate_range(type, base, size, &start_rgn, &end_rgn);
> @@ -928,7 +927,7 @@ static int __init_memblock memblock_setclr_flag(phys_addr_t base,
> */
> int __init_memblock memblock_mark_hotplug(phys_addr_t base, phys_addr_t size)
> {
> - return memblock_setclr_flag(base, size, 1, MEMBLOCK_HOTPLUG);
> + return memblock_setclr_flag(&memblock.memory, base, size, 1, MEMBLOCK_HOTPLUG);
> }
>
> /**
> @@ -940,7 +939,7 @@ int __init_memblock memblock_mark_hotplug(phys_addr_t base, phys_addr_t size)
> */
> int __init_memblock memblock_clear_hotplug(phys_addr_t base, phys_addr_t size)
> {
> - return memblock_setclr_flag(base, size, 0, MEMBLOCK_HOTPLUG);
> + return memblock_setclr_flag(&memblock.memory, base, size, 0, MEMBLOCK_HOTPLUG);
> }
>
> /**
> @@ -957,7 +956,7 @@ int __init_memblock memblock_mark_mirror(phys_addr_t base, phys_addr_t size)
>
> system_has_some_mirror = true;
>
> - return memblock_setclr_flag(base, size, 1, MEMBLOCK_MIRROR);
> + return memblock_setclr_flag(&memblock.memory, base, size, 1, MEMBLOCK_MIRROR);
> }
>
> /**
> @@ -977,7 +976,7 @@ int __init_memblock memblock_mark_mirror(phys_addr_t base, phys_addr_t size)
> */
> int __init_memblock memblock_mark_nomap(phys_addr_t base, phys_addr_t size)
> {
> - return memblock_setclr_flag(base, size, 1, MEMBLOCK_NOMAP);
> + return memblock_setclr_flag(&memblock.memory, base, size, 1, MEMBLOCK_NOMAP);
> }
>
> /**
> @@ -989,7 +988,7 @@ int __init_memblock memblock_mark_nomap(phys_addr_t base, phys_addr_t size)
> */
> int __init_memblock memblock_clear_nomap(phys_addr_t base, phys_addr_t size)
> {
> - return memblock_setclr_flag(base, size, 0, MEMBLOCK_NOMAP);
> + return memblock_setclr_flag(&memblock.memory, base, size, 0, MEMBLOCK_NOMAP);
> }
>
> static bool should_skip_region(struct memblock_type *type,
> --
> 2.25.1
>
--
Sincerely yours,
Mike.
