Commit 7950c407 authored by Yinghai Lu's avatar Yinghai Lu Committed by H. Peter Anvin
Browse files

memblock: Add memblock_free/reserve_reserved_regions() 



So we can avoid export memblock_reserved_init_regions()
Suggested by Ben.

-v2: use __init_memblock attribute

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 5303b68f

include/linux/memblock.h

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ extern int memblock_can_resize; 
	if (memblock_debug) printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)



u64 memblock_find_in_range(u64 start, u64 end, u64 size, u64 align);

int memblock_free_reserved_regions(void);

int memblock_reserve_reserved_regions(void);



extern void __init memblock_init(void);

extern void __init memblock_analyze(void);

mm/memblock.c

+24 −0
Original line number Diff line number Diff line
@@ -170,6 +170,30 @@ u64 __init_memblock memblock_find_in_range(u64 start, u64 end, u64 size, u64 ali 
	return memblock_find_base(size, align, start, end);

}



/*

 * Free memblock.reserved.regions

 */

int __init_memblock memblock_free_reserved_regions(void)

{

	if (memblock.reserved.regions == memblock_reserved_init_regions)

		return 0;



	return memblock_free(__pa(memblock.reserved.regions),

		 sizeof(struct memblock_region) * memblock.reserved.max);

}



/*

 * Reserve memblock.reserved.regions

 */

int __init_memblock memblock_reserve_reserved_regions(void)

{

	if (memblock.reserved.regions == memblock_reserved_init_regions)

		return 0;



	return memblock_reserve(__pa(memblock.reserved.regions),

		 sizeof(struct memblock_region) * memblock.reserved.max);

}



static void __init_memblock memblock_remove_region(struct memblock_type *type, unsigned long r)

{

	unsigned long i;