diff options
author | Jiang Liu <liuj97@gmail.com> | 2013-07-03 18:04:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 19:07:37 -0400 |
commit | a18d0e2d7097937e9f51b83eda4bc750d93eb34d (patch) | |
tree | a18bbe03b0d6b7ec3f7efeede1833bbbe31319cc /arch/s390 | |
parent | 369a9d8523dc7317eccb64b7aee6e9641d84cc8b (diff) |
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>
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/mm/init.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index a2aafe1b2300..ce36ea80e4f9 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c | |||
@@ -135,9 +135,7 @@ void __init paging_init(void) | |||
135 | 135 | ||
136 | void __init mem_init(void) | 136 | void __init mem_init(void) |
137 | { | 137 | { |
138 | unsigned long codesize, reservedpages, datasize, initsize; | 138 | max_mapnr = max_low_pfn; |
139 | |||
140 | max_mapnr = num_physpages = max_low_pfn; | ||
141 | high_memory = (void *) __va(max_low_pfn * PAGE_SIZE); | 139 | high_memory = (void *) __va(max_low_pfn * PAGE_SIZE); |
142 | 140 | ||
143 | /* Setup guest page hinting */ | 141 | /* Setup guest page hinting */ |
@@ -147,18 +145,7 @@ void __init mem_init(void) | |||
147 | free_all_bootmem(); | 145 | free_all_bootmem(); |
148 | setup_zero_pages(); /* Setup zeroed pages. */ | 146 | setup_zero_pages(); /* Setup zeroed pages. */ |
149 | 147 | ||
150 | reservedpages = 0; | 148 | mem_init_print_info(NULL); |
151 | |||
152 | codesize = (unsigned long) &_etext - (unsigned long) &_text; | ||
153 | datasize = (unsigned long) &_edata - (unsigned long) &_etext; | ||
154 | initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; | ||
155 | printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, %ldk data, %ldk init)\n", | ||
156 | nr_free_pages() << (PAGE_SHIFT-10), | ||
157 | max_mapnr << (PAGE_SHIFT-10), | ||
158 | codesize >> 10, | ||
159 | reservedpages << (PAGE_SHIFT-10), | ||
160 | datasize >>10, | ||
161 | initsize >> 10); | ||
162 | printk("Write protected kernel read-only data: %#lx - %#lx\n", | 149 | printk("Write protected kernel read-only data: %#lx - %#lx\n", |
163 | (unsigned long)&_stext, | 150 | (unsigned long)&_stext, |
164 | PFN_ALIGN((unsigned long)&_eshared) - 1); | 151 | PFN_ALIGN((unsigned long)&_eshared) - 1); |