Commit 4d72868c authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

memblock: replace usage of __memblock_free_early() with memblock_free() 

__memblock_free_early() is only used by the convenience wrappers, so
essentially we wrap a call to memblock_free() twice.  Replace calls of
__memblock_free_early() with calls to memblock_free() and drop the former.

Link: http://lkml.kernel.org/r/20181125102940.GE28634@rapoport-lnx


Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Wentao Wang <witallwang@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d31cfe7b

include/linux/memblock.h

+2 −3
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ void __next_mem_range_rev(u64 *idx, int nid, enum memblock_flags flags, 
void __next_reserved_mem_region(u64 *idx, phys_addr_t *out_start,

				phys_addr_t *out_end);



void __memblock_free_early(phys_addr_t base, phys_addr_t size);

void __memblock_free_late(phys_addr_t base, phys_addr_t size);



/**
@@ -414,13 +413,13 @@ static inline void * __init memblock_alloc_node_nopanic(phys_addr_t size, 
static inline void __init memblock_free_early(phys_addr_t base,

					      phys_addr_t size)

{

	__memblock_free_early(base, size);

	memblock_free(base, size);

}



static inline void __init memblock_free_early_nid(phys_addr_t base,

						  phys_addr_t size, int nid)

{

	__memblock_free_early(base, size);

	memblock_free(base, size);

}



static inline void __init memblock_free_late(phys_addr_t base, phys_addr_t size)

mm/memblock.c

+8 −14
Original line number Diff line number Diff line
@@ -800,7 +800,14 @@ int __init_memblock memblock_remove(phys_addr_t base, phys_addr_t size) 
	return memblock_remove_range(&memblock.memory, base, size);

}





/**

 * memblock_free - free boot memory block

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

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

 *

 * Free boot memory block previously allocated by memblock_alloc_xx() API.

 * The freeing memory will not be released to the buddy allocator.

 */

int __init_memblock memblock_free(phys_addr_t base, phys_addr_t size)

{

	phys_addr_t end = base + size - 1;
@@ -1536,19 +1543,6 @@ void * __init memblock_alloc_try_nid( 
	return NULL;

}



/**

 * __memblock_free_early - free boot memory block

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

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

 *

 * Free boot memory block previously allocated by memblock_alloc_xx() API.

 * The freeing memory will not be released to the buddy allocator.

 */

void __init __memblock_free_early(phys_addr_t base, phys_addr_t size)

{

	memblock_free(base, size);

}



/**

 * __memblock_free_late - free bootmem block pages directly to buddy allocator

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE