lkml.org 
[lkml]   [2010]   [Jul]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 41/49] x86, memblock: Add memblock_x86_find_in_range_node()
    Date
    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>
    ---
    arch/x86/include/asm/memblock.h | 1 +
    arch/x86/mm/memblock.c | 15 +++++++++++++++
    2 files changed, 16 insertions(+), 0 deletions(-)

    diff --git a/arch/x86/include/asm/memblock.h b/arch/x86/include/asm/memblock.h
    index 16af28d..3a86b10 100644
    --- a/arch/x86/include/asm/memblock.h
    +++ b/arch/x86/include/asm/memblock.h
    @@ -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,
    unsigned long last_pfn);
    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
    diff --git a/arch/x86/mm/memblock.c b/arch/x86/mm/memblock.c
    index e09b66f..2b69820 100644
    --- a/arch/x86/mm/memblock.c
    +++ b/arch/x86/mm/memblock.c
    @@ -240,6 +240,21 @@ void __init memblock_x86_free_range(u64 start, u64 end)
    }

    /*
    + * 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
    * returns its range in ei_startpfn and ei_endpfn for the memblock entry.
    */
    --
    1.6.4.2


    \
     
     \ /
      Last update: 2010-07-07 00:49    [W:0.062 / U:61.204 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site