lkml.org 
[lkml]   [2010]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/31] memblock: Expose MEMBLOCK_ALLOC_ANYWHERE
    Date
    From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

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

    diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
    index 2b0a807..c630b4f 100644
    --- a/arch/powerpc/mm/hash_utils_64.c
    +++ b/arch/powerpc/mm/hash_utils_64.c
    @@ -625,7 +625,7 @@ static void __init htab_initialize(void)
    if (machine_is(cell))
    limit = 0x80000000;
    else
    - limit = 0;
    + limit = MEMBLOCK_ALLOC_ANYWHERE;

    table = memblock_alloc_base(htab_size_bytes, htab_size_bytes, limit);

    diff --git a/include/linux/memblock.h b/include/linux/memblock.h
    index 3e4a52f..5853752 100644
    --- a/include/linux/memblock.h
    +++ b/include/linux/memblock.h
    @@ -50,6 +50,7 @@ extern u64 __init memblock_alloc_nid(u64 size, u64 align, int nid);
    extern u64 __init memblock_alloc(u64 size, u64 align);
    extern u64 __init memblock_alloc_base(u64 size,
    u64, u64 max_addr);
    +#define MEMBLOCK_ALLOC_ANYWHERE 0
    extern u64 __init __memblock_alloc_base(u64 size,
    u64 align, u64 max_addr);
    extern u64 __init memblock_phys_mem_size(void);
    diff --git a/mm/memblock.c b/mm/memblock.c
    index 9b71de0..0ad7626 100644
    --- a/mm/memblock.c
    +++ b/mm/memblock.c
    @@ -15,8 +15,6 @@
    #include <linux/bitops.h>
    #include <linux/memblock.h>

    -#define MEMBLOCK_ALLOC_ANYWHERE 0
    -
    struct memblock memblock;

    static int memblock_debug;
    --
    1.6.4.2


    \
     
     \ /
      Last update: 2010-07-22 20:25    [W:0.024 / U:30.336 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site