Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Prepare for removing num_physpages and simplify mem_init().

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Jiang Liu and committed by
Linus Torvalds
4e422de9 02f55324

+2 -31
+2 -31
arch/cris/mm/init.c
··· 19 19 void __init 20 20 mem_init(void) 21 21 { 22 - int codesize, reservedpages, datasize, initsize; 23 - unsigned long tmp; 24 - 25 22 BUG_ON(!mem_map); 26 23 27 24 /* max/min_low_pfn was set by setup.c ··· 26 29 * 27 30 * high_memory was also set in setup.c 28 31 */ 29 - 30 - max_mapnr = num_physpages = max_low_pfn - min_low_pfn; 31 - 32 - /* this will put all memory onto the freelists */ 32 + max_mapnr = max_low_pfn - min_low_pfn; 33 33 free_all_bootmem(); 34 - 35 - reservedpages = 0; 36 - for (tmp = 0; tmp < max_mapnr; tmp++) { 37 - /* 38 - * Only count reserved RAM pages 39 - */ 40 - if (PageReserved(mem_map + tmp)) 41 - reservedpages++; 42 - } 43 - 44 - codesize = (unsigned long) &_etext - (unsigned long) &_stext; 45 - datasize = (unsigned long) &_edata - (unsigned long) &_etext; 46 - initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; 47 - 48 - printk(KERN_INFO 49 - "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, " 50 - "%dk init)\n" , 51 - nr_free_pages() << (PAGE_SHIFT-10), 52 - max_mapnr << (PAGE_SHIFT-10), 53 - codesize >> 10, 54 - reservedpages << (PAGE_SHIFT-10), 55 - datasize >> 10, 56 - initsize >> 10 57 - ); 34 + mem_init_print_info(NULL); 58 35 } 59 36 60 37 /* free the pages occupied by initialization code */