Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad941989 authored by Jiang Liu's avatar Jiang Liu Committed by Linus Torvalds
Browse files

mm/score: prepare for removing num_physpages and simplify mem_init() 



Prepare for removing num_physpages and simplify mem_init().

Signed-off-by: default avatarJiang Liu <jiang.liu@huawei.com>
Cc: Chen Liqin <liqin.chen@sunplusct.com>
Cc: Lennox Wu <lennox.wu@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a18d0e2d

arch/score/mm/init.c

+2 −24
Original line number Diff line number Diff line
@@ -75,33 +75,11 @@ void __init paging_init(void) 


void __init mem_init(void)

{

	unsigned long codesize, reservedpages, datasize, initsize;

	unsigned long tmp, ram = 0;



	high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);

	free_all_bootmem();

	setup_zero_page();	/* Setup zeroed pages. */

	reservedpages = 0;



	for (tmp = 0; tmp < max_low_pfn; tmp++)

		if (page_is_ram(tmp)) {

			ram++;

			if (PageReserved(pfn_to_page(tmp)))

				reservedpages++;

		}



	num_physpages = ram;

	codesize = (unsigned long) &_etext - (unsigned long) &_text;

	datasize = (unsigned long) &_edata - (unsigned long) &_etext;

	initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;



	printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, "

			"%ldk reserved, %ldk data, %ldk init, %ldk highmem)\n",

			(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),

			ram << (PAGE_SHIFT-10), codesize >> 10,

			reservedpages << (PAGE_SHIFT-10), datasize >> 10,

			initsize >> 10,

			totalhigh_pages << (PAGE_SHIFT-10));

	mem_init_print_info(NULL);

}

#endif /* !CONFIG_NEED_MULTIPLE_NODES */