lkml.org 
[lkml]   [2013]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6, part4 15/41] mm/AVR32: prepare for removing num_physpages and simplify mem_init()
    Date
    Prepare for removing num_physpages and simplify mem_init().

    Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
    Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
    Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
    Cc: linux-kernel@vger.kernel.org
    ---
    arch/avr32/mm/init.c | 29 ++++-------------------------
    1 file changed, 4 insertions(+), 25 deletions(-)

    diff --git a/arch/avr32/mm/init.c b/arch/avr32/mm/init.c
    index af6890f..0fc04b9 100644
    --- a/arch/avr32/mm/init.c
    +++ b/arch/avr32/mm/init.c
    @@ -100,26 +100,16 @@ void __init paging_init(void)

    void __init mem_init(void)
    {
    - int codesize, reservedpages, datasize, initsize;
    - int nid, i;
    + pg_data_t *pgdat;

    - reservedpages = 0;
    high_memory = NULL;

    /* this will put all low memory onto the freelists */
    - for_each_online_node(nid) {
    - pg_data_t *pgdat = NODE_DATA(nid);
    - unsigned long node_pages = 0;
    + for_each_online_pgdat(pgdat) {
    void *node_high_memory;

    - num_physpages += pgdat->node_present_pages;
    -
    if (pgdat->node_spanned_pages != 0)
    - node_pages = free_all_bootmem_node(pgdat);
    -
    - for (i = 0; i < node_pages; i++)
    - if (PageReserved(pgdat->node_mem_map + i))
    - reservedpages++;
    + free_all_bootmem_node(pgdat);

    node_high_memory = (void *)((pgdat->node_start_pfn
    + pgdat->node_spanned_pages)
    @@ -130,18 +120,7 @@ void __init mem_init(void)

    max_mapnr = MAP_NR(high_memory);

    - codesize = (unsigned long)_etext - (unsigned long)_text;
    - datasize = (unsigned long)_edata - (unsigned long)_data;
    - initsize = (unsigned long)__init_end - (unsigned long)__init_begin;
    -
    - printk ("Memory: %luk/%luk available (%dk kernel code, "
    - "%dk reserved, %dk data, %dk init)\n",
    - nr_free_pages() << (PAGE_SHIFT - 10),
    - totalram_pages << (PAGE_SHIFT - 10),
    - codesize >> 10,
    - reservedpages << (PAGE_SHIFT - 10),
    - datasize >> 10,
    - initsize >> 10);
    + mem_init_print_info(NULL);
    }

    void free_initmem(void)
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-05-29 20:21    [W:4.926 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site