Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 808c2c37 authored by Jiang Liu's avatar Jiang Liu Committed by Linus Torvalds
Browse files

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



Prepare for removing num_physpages and simplify mem_init().

Signed-off-by: default avatarJiang Liu <jiang.liu@huawei.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 46a84132

arch/xtensa/mm/init.c

+2 −25
Original line number Diff line number Diff line
@@ -173,12 +173,8 @@ void __init zones_init(void) 


void __init mem_init(void)

{

	unsigned long codesize, reservedpages, datasize, initsize;

	unsigned long highmemsize, tmp, ram;



	max_mapnr = num_physpages = max_low_pfn - ARCH_PFN_OFFSET;

	max_mapnr = max_low_pfn - ARCH_PFN_OFFSET;

	high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);

	highmemsize = 0;



#ifdef CONFIG_HIGHMEM

#error HIGHGMEM not implemented in init.c
@@ -186,26 +182,7 @@ void __init mem_init(void) 


	free_all_bootmem();



	reservedpages = ram = 0;

	for (tmp = 0; tmp < max_mapnr; tmp++) {

		ram++;

		if (PageReserved(mem_map+tmp))

			reservedpages++;

	}



	codesize =  (unsigned long) _etext - (unsigned long) _stext;

	datasize =  (unsigned long) _edata - (unsigned long) _sdata;

	initsize =  (unsigned long) __init_end - (unsigned long) __init_begin;



	printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, "

	       "%ldk data, %ldk init %ldk highmem)\n",

	       nr_free_pages() << (PAGE_SHIFT-10),

	       ram << (PAGE_SHIFT-10),

	       codesize >> 10,

	       reservedpages << (PAGE_SHIFT-10),

	       datasize >> 10,

	       initsize >> 10,

	       highmemsize >> 10);

	mem_init_print_info(NULL);

}



#ifdef CONFIG_BLK_DEV_INITRD