lkml.org 
[lkml]   [2011]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 19/23] mips: Use HAVE_MEMBLOCK_NODE_MAP
    Date
    mips used early_node_map[] just to prime free_area_init_nodes().  Now
    memblock can be used for the same purpose and early_node_map[] is
    scheduled to be dropped. Use memblock instead.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Yinghai Lu <yinghai@kernel.org>
    Cc: Ralf Baechle <ralf@linux-mips.org>
    Cc: linux-mips@linux-mips.org
    ---
    Only compile tested. Thanks.

    arch/mips/Kconfig | 3 +++
    arch/mips/kernel/setup.c | 3 ++-
    arch/mips/sgi-ip27/ip27-memory.c | 5 +++--
    3 files changed, 8 insertions(+), 3 deletions(-)

    diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
    index 653da62..368b2ec 100644
    --- a/arch/mips/Kconfig
    +++ b/arch/mips/Kconfig
    @@ -24,6 +24,9 @@ config MIPS
    select GENERIC_IRQ_PROBE
    select GENERIC_IRQ_SHOW
    select HAVE_ARCH_JUMP_LABEL
    + select HAVE_MEMBLOCK
    + select HAVE_MEMBLOCK_NODE_MAP
    + select ARCH_DISCARD_MEMBLOCK

    menu "Machine selection"

    diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
    index 8ad1d56..c25bce4 100644
    --- a/arch/mips/kernel/setup.c
    +++ b/arch/mips/kernel/setup.c
    @@ -14,6 +14,7 @@
    #include <linux/ioport.h>
    #include <linux/module.h>
    #include <linux/screen_info.h>
    +#include <linux/memblock.h>
    #include <linux/bootmem.h>
    #include <linux/initrd.h>
    #include <linux/root_dev.h>
    @@ -352,7 +353,7 @@ static void __init bootmem_init(void)
    continue;
    #endif

    - add_active_range(0, start, end);
    + memblock_add_node(PFN_PHYS(start), PFN_PHYS(end - start), 0);
    }

    /*
    diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c
    index bc12971..b105eca 100644
    --- a/arch/mips/sgi-ip27/ip27-memory.c
    +++ b/arch/mips/sgi-ip27/ip27-memory.c
    @@ -12,6 +12,7 @@
    */
    #include <linux/init.h>
    #include <linux/kernel.h>
    +#include <linux/memblock.h>
    #include <linux/mm.h>
    #include <linux/mmzone.h>
    #include <linux/module.h>
    @@ -381,8 +382,8 @@ static void __init szmem(void)
    continue;
    }
    num_physpages += slot_psize;
    - add_active_range(node, slot_getbasepfn(node, slot),
    - slot_getbasepfn(node, slot) + slot_psize);
    + memblock_add_node(PFN_PHYS(slot_getbasepfn(node, slot)),
    + PFN_PHYS(slot_psize), node);
    }
    }
    }
    --
    1.7.6


    \
     
     \ /
      Last update: 2011-07-26 17:39    [W:0.023 / U:62.260 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site