On 07/04/13 00:32, Jiang Liu wrote:
> Prepare for removing num_physpages and simplify mem_init().
>
> Signed-off-by: Jiang Liu <jiang....@huawei.com>
> Cc: Geert Uytterhoeven <ge...@linux-m68k.org>
> Cc: Greg Ungerer <g...@uclinux.org>
Acked-by: Greg Ungerer <g...@uclinux.org
> Cc: linux-m...@lists.linux-m68k.org
> Cc: linux-kernel@vger.kernel.org
> ---
> arch/m68k/mm/init.c | 31 ++-----------------------------
> 1 file changed, 2 insertions(+), 29 deletions(-)
>
> diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
> index 2485a8c..0723141 100644
> --- a/arch/m68k/mm/init.c
> +++ b/arch/m68k/mm/init.c
> @@ -149,33 +149,11 @@ void __init print_memmap(void)
> void __init mem_init(void)
> {
> pg_data_t *pgdat;
> - int codepages = 0;
> - int datapages = 0;
> - int initpages = 0;
> int i;
>
> /* this will put all memory onto the freelists */
> - num_physpages = 0;
> - for_each_online_pgdat(pgdat) {
> - num_physpages += pgdat->node_present_pages;
> -
> + for_each_online_pgdat(pgdat)
> free_all_bootmem_node(pgdat);
> - for (i = 0; i < pgdat->node_spanned_pages; i++) {
> - struct page *page = pgdat->node_mem_map + i;
> - char *addr = page_to_virt(page);
> -
> - if (!PageReserved(page))
> - continue;
> - if (addr >= _text &&
> - addr < _etext)
> - codepages++;
> - else if (addr >= __init_begin &&
> - addr < __init_end)
> - initpages++;
> - else
> - datapages++;
> - }
> - }
>
> #if defined(CONFIG_MMU) && !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
> /* insert pointer tables allocated so far into the tablelist */
> @@ -190,12 +168,7 @@ void __init mem_init(void)
> init_pointer_table((unsigned long)zero_pgtable);
> #endif
>
> - pr_info("Memory: %luk/%luk available (%dk kernel code, %dk data, %dk
> init)\n",
> - nr_free_pages() << (PAGE_SHIFT-10),
> - totalram_pages << (PAGE_SHIFT-10),
> - codepages << (PAGE_SHIFT-10),
> - datapages << (PAGE_SHIFT-10),
> - initpages << (PAGE_SHIFT-10));
> + mem_init_print_info(NULL);
> print_memmap();
> }
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
