renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-29 15:43:59 +08:00
Code

x86, memblock: Add memblock_x86_find_in_range_node()

Browse Source 
It can be used to find NODE_DATA for numa.

Need to make sure early_node_map[] is filled before it is called, otherwise
it will fallback to memblock_find_in_range(), with node range.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
Yinghai Lu 2010-08-25 13:39:16 -07:00 committed by H. Peter Anvin
parent edbe7d23b4
commit 6bcc8176d0
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/include/asm/memblock.h
View File

@ -14,5 +14,6 @@ int get_free_all_memory_range(struct range **rangep, int nodeid);
void memblock_x86_register_active_regions(int nid, unsigned long start_pfn, void memblock_x86_register_active_regions(int nid, unsigned long start_pfn,
unsigned long last_pfn); unsigned long last_pfn);
u64 memblock_x86_hole_size(u64 start, u64 end); u64 memblock_x86_hole_size(u64 start, u64 end);
u64 memblock_x86_find_in_range_node(int nid, u64 start, u64 end, u64 size, u64 align);
#endif #endif

15
arch/x86/mm/memblock.c
View File

@ -233,6 +233,21 @@ void __init memblock_x86_free_range(u64 start, u64 end)
memblock_free(start, end - start); memblock_free(start, end - start);
} }
/*
* Need to call this function after memblock_x86_register_active_regions,
* so early_node_map[] is filled already.
*/
u64 __init memblock_x86_find_in_range_node(int nid, u64 start, u64 end, u64 size, u64 align)
{
u64 addr;
addr = find_memory_core_early(nid, size, align, start, end);
if (addr != MEMBLOCK_ERROR)
return addr;
/* Fallback, should already have start end within node range */
return memblock_find_in_range(start, end, size, align);
}
/* /*
* Finds an active region in the address range from start_pfn to last_pfn and * Finds an active region in the address range from start_pfn to last_pfn and
* returns its range in ei_startpfn and ei_endpfn for the memblock entry. * returns its range in ei_startpfn and ei_endpfn for the memblock entry.