lkml.org 
[lkml]   [2013]   [May]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5, part4 40/41] mm/xtensa: 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>
    Cc: Chris Zankel <chris@zankel.net>
    Cc: Max Filippov <jcmvbkbc@gmail.com>
    Cc: Geert Uytterhoeven <geert@linux-m68k.org>
    Cc: linux-xtensa@linux-xtensa.org
    Cc: linux-kernel@vger.kernel.org
    ---
    arch/xtensa/mm/init.c | 27 ++-------------------------
    1 file changed, 2 insertions(+), 25 deletions(-)

    diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
    index dc6e009..267428e 100644
    --- a/arch/xtensa/mm/init.c
    +++ b/arch/xtensa/mm/init.c
    @@ -173,12 +173,8 @@ void __init zones_init(void)

    void __init mem_init(void)
    {
    - unsigned long codesize, reservedpages, datasize, initsize;
    - unsigned long highmemsize, tmp, ram;
    -
    - max_mapnr = num_physpages = max_low_pfn - ARCH_PFN_OFFSET;
    + max_mapnr = max_low_pfn - ARCH_PFN_OFFSET;
    high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);
    - highmemsize = 0;

    #ifdef CONFIG_HIGHMEM
    #error HIGHGMEM not implemented in init.c
    @@ -186,26 +182,7 @@ void __init mem_init(void)

    free_all_bootmem();

    - reservedpages = ram = 0;
    - for (tmp = 0; tmp < max_mapnr; tmp++) {
    - ram++;
    - if (PageReserved(mem_map+tmp))
    - reservedpages++;
    - }
    -
    - codesize = (unsigned long) _etext - (unsigned long) _stext;
    - datasize = (unsigned long) _edata - (unsigned long) _sdata;
    - initsize = (unsigned long) __init_end - (unsigned long) __init_begin;
    -
    - printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, "
    - "%ldk data, %ldk init %ldk highmem)\n",
    - nr_free_pages() << (PAGE_SHIFT-10),
    - ram << (PAGE_SHIFT-10),
    - codesize >> 10,
    - reservedpages << (PAGE_SHIFT-10),
    - datasize >> 10,
    - initsize >> 10,
    - highmemsize >> 10);
    + mem_init_print_info(NULL);
    }

    #ifdef CONFIG_BLK_DEV_INITRD
    --
    1.7.9.5


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