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

Commit 76feaede authored by Jiang Liu's avatar Jiang Liu Committed by Linus Torvalds
Browse files

mm/mn10300: 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: David Howells <dhowells@redhat.com>
Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1132137e

arch/mn10300/mm/init.c

+2 −24
Original line number Original line Diff line number Diff line
@@ -99,15 +99,12 @@ void __init paging_init(void) 
 */

 */

void __init mem_init(void)

void __init mem_init(void)

{

{

	int codesize, reservedpages, datasize, initsize;

	int tmp;



	BUG_ON(!mem_map);

	BUG_ON(!mem_map);





#define START_PFN	(contig_page_data.bdata->node_min_pfn)

#define START_PFN	(contig_page_data.bdata->node_min_pfn)

#define MAX_LOW_PFN	(contig_page_data.bdata->node_low_pfn)

#define MAX_LOW_PFN	(contig_page_data.bdata->node_low_pfn)





	max_mapnr = num_physpages = MAX_LOW_PFN - START_PFN;

	max_mapnr = MAX_LOW_PFN - START_PFN;

	high_memory = (void *) __va(MAX_LOW_PFN * PAGE_SIZE);

	high_memory = (void *) __va(MAX_LOW_PFN * PAGE_SIZE);





	/* clear the zero-page */

	/* clear the zero-page */
@@ -116,26 +113,7 @@ void __init mem_init(void) 
	/* this will put all low memory onto the freelists */

	/* this will put all low memory onto the freelists */

	free_all_bootmem();

	free_all_bootmem();





	reservedpages = 0;

	mem_init_print_info(NULL);

	for (tmp = 0; tmp < num_physpages; tmp++)

		if (PageReserved(&mem_map[tmp]))

			reservedpages++;



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

	datasize =  (unsigned long) &_edata - (unsigned long) &_etext;

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



	printk(KERN_INFO

	       "Memory: %luk/%luk available"

	       " (%dk kernel code, %dk reserved, %dk data, %dk init,"

	       " %ldk highmem)\n",

	       nr_free_pages() << (PAGE_SHIFT - 10),

	       max_mapnr << (PAGE_SHIFT - 10),

	       codesize >> 10,

	       reservedpages << (PAGE_SHIFT - 10),

	       datasize >> 10,

	       initsize >> 10,

	       totalhigh_pages << (PAGE_SHIFT - 10));

}

}





/*

/*