lkml.org 
[lkml]   [2010]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 26/49] memblock: Make memblock_alloc_try_nid() fallback to MEMBLOCK_ALLOC_ANYWHERE
    Date
    From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

    memblock_alloc_nid() used to fallback to allocating anywhere by using
    memblock_alloc() as a fallback.

    However, some of my previous patches limit memblock_alloc() to the region
    covered by MEMBLOCK_ALLOC_ACCESSIBLE which is not quite what we want
    for memblock_alloc_try_nid().

    So we fix it by explicitely using MEMBLOCK_ALLOC_ANYWHERE.

    Not that so far only sparc uses memblock_alloc_nid() and it hasn't been updated
    to clamp the accessible zone yet. Thus the temporary "breakage" should have
    no effect.

    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    ---
    mm/memblock.c | 2 +-
    1 files changed, 1 insertions(+), 1 deletions(-)

    diff --git a/mm/memblock.c b/mm/memblock.c
    index c3c499e..424ca11 100644
    --- a/mm/memblock.c
    +++ b/mm/memblock.c
    @@ -546,7 +546,7 @@ phys_addr_t __init memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align, i

    if (res)
    return res;
    - return memblock_alloc(size, align);
    + return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ANYWHERE);
    }


    --
    1.6.4.2


    \
     
     \ /
      Last update: 2010-07-20 02:13    [W:3.743 / U:0.484 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site