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

Commit 05f209e7 authored by Pekka Enberg's avatar Pekka Enberg Committed by Ingo Molnar
Browse files

x86: add sanity checks to init_32.c 



Impact: unification

This patch adds sanity checks that are already in init_64.c to init_32.c.

Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
LKML-Reference: <1236078902.2675.16.camel@penberg-laptop>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent fd578f9c

arch/x86/mm/init_32.c

+11 −6
Original line number Diff line number Diff line
@@ -1214,18 +1214,21 @@ void mark_rodata_ro(void) 


void free_init_pages(char *what, unsigned long begin, unsigned long end)

{

#ifdef CONFIG_DEBUG_PAGEALLOC

	unsigned long addr = begin;



	if (addr >= end)

		return;



	/*

	 * If debugging page accesses then do not free this memory but

	 * mark them not present - any buggy init-section access will

	 * create a kernel page fault:

	 */

#ifdef CONFIG_DEBUG_PAGEALLOC

	printk(KERN_INFO "debug: unmapping init memory %08lx..%08lx\n",

		begin, PAGE_ALIGN(end));

	set_memory_np(begin, (end - begin) >> PAGE_SHIFT);

#else

	unsigned long addr;



	/*

	 * We just marked the kernel text read only above, now that

	 * we are going to free part of that, we need to make that
@@ -1233,14 +1236,16 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end) 
	 */

	set_memory_rw(begin, (end - begin) >> PAGE_SHIFT);



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

	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);

		memset((void *)(addr & ~(PAGE_SIZE-1)),

			POISON_FREE_INITMEM, PAGE_SIZE);

		free_page(addr);

		totalram_pages++;

	}

	printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);

#endif

}