lkml.org 
[lkml]   [2012]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 44/46] sparc, mm: Remove calling of free_all_bootmem_node()
    Date
    Now NO_BOOTMEM version free_all_bootmem_node() does not really
    do free_bootmem at all, and it only call
    register_page_bootmem_info_node instead.

    That is confusing, try to kill that free_all_bootmem_node().

    Before that, this patch will remove calling of free_all_bootmem_node()

    We add register_page_bootmem_info() to call register_page_bootmem_info_node
    directly.

    Also could use free_all_bootmem() for numa case, and it is just
    the same as free_low_memory_core_early().

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Cc: "David S. Miller" <davem@davemloft.net>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: sparclinux@vger.kernel.org
    Acked-by: "David S. Miller" <davem@davemloft.net>
    ---
    arch/sparc/mm/init_64.c | 24 +++++++++++-------------
    1 files changed, 11 insertions(+), 13 deletions(-)

    diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
    index 9e28a11..b24bac2 100644
    --- a/arch/sparc/mm/init_64.c
    +++ b/arch/sparc/mm/init_64.c
    @@ -2021,6 +2021,16 @@ static void __init patch_tlb_miss_handler_bitmap(void)
    flushi(&valid_addr_bitmap_insn[0]);
    }

    +static void __init register_page_bootmem_info(void)
    +{
    +#ifdef CONFIG_NEED_MULTIPLE_NODES
    + int i;
    +
    + for_each_online_node(i)
    + if (NODE_DATA(i)->node_spanned_pages)
    + register_page_bootmem_info_node(NODE_DATA(i));
    +#endif
    +}
    void __init mem_init(void)
    {
    unsigned long codepages, datapages, initpages;
    @@ -2038,20 +2048,8 @@ void __init mem_init(void)

    high_memory = __va(last_valid_pfn << PAGE_SHIFT);

    -#ifdef CONFIG_NEED_MULTIPLE_NODES
    - {
    - int i;
    - for_each_online_node(i) {
    - if (NODE_DATA(i)->node_spanned_pages != 0) {
    - totalram_pages +=
    - free_all_bootmem_node(NODE_DATA(i));
    - }
    - }
    - totalram_pages += free_low_memory_core_early(MAX_NUMNODES);
    - }
    -#else
    + register_page_bootmem_info();
    totalram_pages = free_all_bootmem();
    -#endif

    /* We subtract one to account for the mem_map_zero page
    * allocated below.
    --
    1.7.7


    \
     
     \ /
      Last update: 2012-11-12 23:41    [W:4.076 / U:0.228 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site