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

mm/s390: 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>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.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
a18d0e2d 369a9d85

+2 -15
+2 -15
arch/s390/mm/init.c
··· 135 135 136 136 void __init mem_init(void) 137 137 { 138 - unsigned long codesize, reservedpages, datasize, initsize; 139 - 140 - max_mapnr = num_physpages = max_low_pfn; 138 + max_mapnr = max_low_pfn; 141 139 high_memory = (void *) __va(max_low_pfn * PAGE_SIZE); 142 140 143 141 /* Setup guest page hinting */ ··· 145 147 free_all_bootmem(); 146 148 setup_zero_pages(); /* Setup zeroed pages. */ 147 149 148 - reservedpages = 0; 149 - 150 - codesize = (unsigned long) &_etext - (unsigned long) &_text; 151 - datasize = (unsigned long) &_edata - (unsigned long) &_etext; 152 - initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; 153 - printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, %ldk data, %ldk init)\n", 154 - nr_free_pages() << (PAGE_SHIFT-10), 155 - max_mapnr << (PAGE_SHIFT-10), 156 - codesize >> 10, 157 - reservedpages << (PAGE_SHIFT-10), 158 - datasize >>10, 159 - initsize >> 10); 150 + mem_init_print_info(NULL); 160 151 printk("Write protected kernel read-only data: %#lx - %#lx\n", 161 152 (unsigned long)&_stext, 162 153 PFN_ALIGN((unsigned long)&_eshared) - 1);