Skip to content

Commit 808c2c3

Browse files
jiangliutorvalds
authored andcommitted
mm/xtensa: prepare for removing num_physpages and simplify mem_init()
Prepare for removing num_physpages and simplify mem_init(). Signed-off-by: Jiang Liu <[email protected]> Cc: Chris Zankel <[email protected]> Cc: Max Filippov <[email protected]> Cc: Geert Uytterhoeven <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 46a8413 commit 808c2c3

File tree

1 file changed

+2
-25
lines changed

1 file changed

+2
-25
lines changed

arch/xtensa/mm/init.c

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -173,39 +173,16 @@ void __init zones_init(void)
173173

174174
void __init mem_init(void)
175175
{
176-
unsigned long codesize, reservedpages, datasize, initsize;
177-
unsigned long highmemsize, tmp, ram;
178-
179-
max_mapnr = num_physpages = max_low_pfn - ARCH_PFN_OFFSET;
176+
max_mapnr = max_low_pfn - ARCH_PFN_OFFSET;
180177
high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);
181-
highmemsize = 0;
182178

183179
#ifdef CONFIG_HIGHMEM
184180
#error HIGHGMEM not implemented in init.c
185181
#endif
186182

187183
free_all_bootmem();
188184

189-
reservedpages = ram = 0;
190-
for (tmp = 0; tmp < max_mapnr; tmp++) {
191-
ram++;
192-
if (PageReserved(mem_map+tmp))
193-
reservedpages++;
194-
}
195-
196-
codesize = (unsigned long) _etext - (unsigned long) _stext;
197-
datasize = (unsigned long) _edata - (unsigned long) _sdata;
198-
initsize = (unsigned long) __init_end - (unsigned long) __init_begin;
199-
200-
printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, "
201-
"%ldk data, %ldk init %ldk highmem)\n",
202-
nr_free_pages() << (PAGE_SHIFT-10),
203-
ram << (PAGE_SHIFT-10),
204-
codesize >> 10,
205-
reservedpages << (PAGE_SHIFT-10),
206-
datasize >> 10,
207-
initsize >> 10,
208-
highmemsize >> 10);
185+
mem_init_print_info(NULL);
209186
}
210187

211188
#ifdef CONFIG_BLK_DEV_INITRD

0 commit comments

Comments
 (0)