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

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

mm/x86: use common help functions to free reserved pages 



Use common help functions to free reserved pages.

Signed-off-by: default avatarJiang Liu <jiang.liu@huawei.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ccecb510

arch/x86/mm/init.c

+1 −4
Original line number Diff line number Diff line
@@ -515,11 +515,8 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end) 
	printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);



	for (; addr < end; addr += PAGE_SIZE) {

		ClearPageReserved(virt_to_page(addr));

		init_page_count(virt_to_page(addr));

		memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);

		free_page(addr);

		totalram_pages++;

		free_reserved_page(virt_to_page(addr));

	}

#endif

}

arch/x86/mm/init_64.c

+2 −3
Original line number Diff line number Diff line
@@ -1067,10 +1067,9 @@ void __init mem_init(void) 


	/* clear_bss() already clear the empty_zero_page */



	reservedpages = 0;



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

	register_page_bootmem_info();



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

	totalram_pages = free_all_bootmem();



	absent_pages = absent_pages_in_range(0, max_pfn);