lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Jiang Liu
2013-07-03 15:04:10 -07:00
committed by Linus Torvalds
parent 369a9d8523
commit a18d0e2d70
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
arch/s390/mm/init.c
View File

@@ -135,9 +135,7 @@ void __init paging_init(void)
void __init mem_init(void) void __init mem_init(void)
{ {
unsigned long codesize, reservedpages, datasize, initsize; max_mapnr = max_low_pfn;
max_mapnr = num_physpages = max_low_pfn;
high_memory = (void *) __va(max_low_pfn * PAGE_SIZE); high_memory = (void *) __va(max_low_pfn * PAGE_SIZE);
/* Setup guest page hinting */ /* Setup guest page hinting */
@@ -147,18 +145,7 @@ void __init mem_init(void)
free_all_bootmem(); free_all_bootmem();
setup_zero_pages(); /* Setup zeroed pages. */ setup_zero_pages(); /* Setup zeroed pages. */
reservedpages = 0; mem_init_print_info(NULL);
codesize = (unsigned long) &_etext - (unsigned long) &_text;
datasize = (unsigned long) &_edata - (unsigned long) &_etext;
initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, %ldk data, %ldk init)\n",
nr_free_pages() << (PAGE_SHIFT-10),
max_mapnr << (PAGE_SHIFT-10),
codesize >> 10,
reservedpages << (PAGE_SHIFT-10),
datasize >>10,
initsize >> 10);
printk("Write protected kernel read-only data: %#lx - %#lx\n", printk("Write protected kernel read-only data: %#lx - %#lx\n",
(unsigned long)&_stext, (unsigned long)&_stext,
PFN_ALIGN((unsigned long)&_eshared) - 1); PFN_ALIGN((unsigned long)&_eshared) - 1);