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

Commit 0c988534 authored by Jiang Liu's avatar Jiang Liu Committed by Linus Torvalds
Browse files

mm: concentrate modification of totalram_pages into the mm core 



Concentrate code to modify totalram_pages into the mm core, so the arch
memory initialized code doesn't need to take care of it.  With these
changes applied, only following functions from mm core modify global
variable totalram_pages: free_bootmem_late(), free_all_bootmem(),
free_all_bootmem_node(), adjust_managed_page_count().

With this patch applied, it will be much more easier for us to keep
totalram_pages and zone->managed_pages in consistence.

Signed-off-by: default avatarJiang Liu <jiang.liu@huawei.com>
Acked-by: default avatarDavid Howells <dhowells@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: <sworddragon2@aol.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Jianguo Wu <wujianguo@huawei.com>
Cc: Joonsoo Kim <js1304@gmail.com>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Michel Lespinasse <walken@google.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Tang Chen <tangchen@cn.fujitsu.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3dcc0571

arch/alpha/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ void __init 
mem_init(void)

{

	max_mapnr = num_physpages = max_low_pfn;

	totalram_pages += free_all_bootmem();

	free_all_bootmem();

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



	printk_memory_info();

arch/alpha/mm/numa.c

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ void __init mem_init(void) 
		/*

		 * This will free up the bootmem, ie, slot 0 memory

		 */

		totalram_pages += free_all_bootmem_node(NODE_DATA(nid));

		free_all_bootmem_node(NODE_DATA(nid));



		pfn = NODE_DATA(nid)->node_start_pfn;

		for (i = 0; i < node_spanned_pages(nid); i++, pfn++)

arch/arc/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ void __init mem_init(void) 


	high_memory = (void *)(CONFIG_LINUX_LINK_BASE + arc_mem_sz);



	totalram_pages = free_all_bootmem();

	free_all_bootmem();



	/* count all reserved pages [kernel code/data/mem_map..] */

	reserved_pages = 0;

arch/arm/mm/init.c

+1 −2
Original line number Diff line number Diff line
@@ -596,8 +596,7 @@ void __init mem_init(void) 


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

	free_unused_memmap(&meminfo);



	totalram_pages += free_all_bootmem();

	free_all_bootmem();



#ifdef CONFIG_SA1111

	/* now that our DMA memory is actually so designated, we can free it */

arch/arm64/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ void __init mem_init(void) 
	free_unused_memmap();

#endif



	totalram_pages += free_all_bootmem();

	free_all_bootmem();



	reserved_pages = free_pages = 0;