lkml.org 
[lkml]   [2010]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 39/43] memblock: Export MEMBLOCK_ERROR
    Date
    From: Yinghai Lu <yinghai@kernel.org>

    will used by x86 memblock_x86_find_in_range_node and nobootmem replacement

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

    diff --git a/include/linux/memblock.h b/include/linux/memblock.h
    index eed0f9b..1a9c29c 100644
    --- a/include/linux/memblock.h
    +++ b/include/linux/memblock.h
    @@ -18,7 +18,8 @@

    #include <asm/memblock.h>

    -#define INIT_MEMBLOCK_REGIONS 128
    +#define INIT_MEMBLOCK_REGIONS 128
    +#define MEMBLOCK_ERROR (~(phys_addr_t)0)

    struct memblock_region {
    phys_addr_t base;
    diff --git a/mm/memblock.c b/mm/memblock.c
    index c3703ab..85cfa1d 100644
    --- a/mm/memblock.c
    +++ b/mm/memblock.c
    @@ -27,8 +27,6 @@ int memblock_can_resize;
    static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS + 1];
    static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS + 1];

    -#define MEMBLOCK_ERROR (~(phys_addr_t)0)
    -
    /* inline so we don't get a warning when pr_debug is compiled out */
    static inline const char *memblock_type_name(struct memblock_type *type)
    {
    --
    1.7.0.4


    \
     
     \ /
      Last update: 2010-08-06 07:19    [W:0.023 / U:33.056 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site