Commit 621d9739 authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

memblock: stop aliasing __memblock_free_late with memblock_free_late 

memblock_free_late() is a NOP wrapper for __memblock_free_late(), there
is no point to keep this indirection.

Drop the wrapper and rename __memblock_free_late() to
memblock_free_late().

Link: https://lkml.kernel.org/r/20210930185031.18648-5-rppt@kernel.org


Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Juergen Gross <jgross@suse.com>
Cc: Shahab Vahedi <Shahab.Vahedi@synopsys.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fa277171

include/linux/memblock.h

+1 −6
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ void __next_mem_range_rev(u64 *idx, int nid, enum memblock_flags flags, 
			  struct memblock_type *type_b, phys_addr_t *out_start,

			  phys_addr_t *out_end, int *out_nid);



void __memblock_free_late(phys_addr_t base, phys_addr_t size);

void memblock_free_late(phys_addr_t base, phys_addr_t size);



#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP

static inline void __next_physmem_range(u64 *idx, struct memblock_type *type,
@@ -441,11 +441,6 @@ static inline void *memblock_alloc_node(phys_addr_t size, 
				      MEMBLOCK_ALLOC_ACCESSIBLE, nid);

}



static inline void memblock_free_late(phys_addr_t base, phys_addr_t size)

{

	__memblock_free_late(base, size);

}



/*

 * Set the allocation direction to bottom-up or top-down.

 */

mm/memblock.c

+4 −4
Original line number Diff line number Diff line
@@ -366,14 +366,14 @@ void __init memblock_discard(void) 
		addr = __pa(memblock.reserved.regions);

		size = PAGE_ALIGN(sizeof(struct memblock_region) *

				  memblock.reserved.max);

		__memblock_free_late(addr, size);

		memblock_free_late(addr, size);

	}



	if (memblock.memory.regions != memblock_memory_init_regions) {

		addr = __pa(memblock.memory.regions);

		size = PAGE_ALIGN(sizeof(struct memblock_region) *

				  memblock.memory.max);

		__memblock_free_late(addr, size);

		memblock_free_late(addr, size);

	}



	memblock_memory = NULL;
@@ -1589,7 +1589,7 @@ void * __init memblock_alloc_try_nid( 
}



/**

 * __memblock_free_late - free pages directly to buddy allocator

 * memblock_free_late - free pages directly to buddy allocator

 * @base: phys starting address of the  boot memory block

 * @size: size of the boot memory block in bytes

 *
@@ -1597,7 +1597,7 @@ void * __init memblock_alloc_try_nid( 
 * down, but we are still initializing the system.  Pages are released directly

 * to the buddy allocator.

 */

void __init __memblock_free_late(phys_addr_t base, phys_addr_t size)

void __init memblock_free_late(phys_addr_t base, phys_addr_t size)

{

	phys_addr_t cursor, end;