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

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

mm/SPARC: 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>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0f47c942

arch/sparc/kernel/leon_smp.c

+3 −12
Original line number Diff line number Diff line
@@ -253,24 +253,15 @@ void __init leon_smp_done(void) 


	/* Free unneeded trap tables */

	if (!cpu_present(1)) {

		ClearPageReserved(virt_to_page(&trapbase_cpu1));

		init_page_count(virt_to_page(&trapbase_cpu1));

		free_page((unsigned long)&trapbase_cpu1);

		totalram_pages++;

		free_reserved_page(virt_to_page(&trapbase_cpu1));

		num_physpages++;

	}

	if (!cpu_present(2)) {

		ClearPageReserved(virt_to_page(&trapbase_cpu2));

		init_page_count(virt_to_page(&trapbase_cpu2));

		free_page((unsigned long)&trapbase_cpu2);

		totalram_pages++;

		free_reserved_page(virt_to_page(&trapbase_cpu2));

		num_physpages++;

	}

	if (!cpu_present(3)) {

		ClearPageReserved(virt_to_page(&trapbase_cpu3));

		init_page_count(virt_to_page(&trapbase_cpu3));

		free_page((unsigned long)&trapbase_cpu3);

		totalram_pages++;

		free_reserved_page(virt_to_page(&trapbase_cpu3));

		num_physpages++;

	}

	/* Ok, they are spinning and ready to go. */

arch/sparc/mm/init_32.c

+3 −34
Original line number Diff line number Diff line
@@ -366,45 +366,14 @@ void __init mem_init(void) 


void free_initmem (void)

{

	unsigned long addr;

	unsigned long freed;



	addr = (unsigned long)(&__init_begin);

	freed = (unsigned long)(&__init_end) - addr;

	for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {

		struct page *p;



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

		p = virt_to_page(addr);



		ClearPageReserved(p);

		init_page_count(p);

		__free_page(p);

		totalram_pages++;

		num_physpages++;

	}

	printk(KERN_INFO "Freeing unused kernel memory: %ldk freed\n",

		freed >> 10);

	num_physpages += free_initmem_default(POISON_FREE_INITMEM);

}



#ifdef CONFIG_BLK_DEV_INITRD

void free_initrd_mem(unsigned long start, unsigned long end)

{

	if (start < end)

		printk(KERN_INFO "Freeing initrd memory: %ldk freed\n",

			(end - start) >> 10);

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

		struct page *p;



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

		p = virt_to_page(start);



		ClearPageReserved(p);

		init_page_count(p);

		__free_page(p);

		totalram_pages++;

		num_physpages++;

	}

	num_physpages += free_reserved_area(start, end, POISON_FREE_INITMEM,

					    "initrd");

}

#endif

arch/sparc/mm/init_64.c

+6 −22
Original line number Diff line number Diff line
@@ -2059,8 +2059,7 @@ void __init mem_init(void) 
	/* We subtract one to account for the mem_map_zero page

	 * allocated below.

	 */

	totalram_pages -= 1;

	num_physpages = totalram_pages;

	num_physpages = totalram_pages - 1;



	/*

	 * Set up the zero page, mark it reserved, so that page count
@@ -2071,7 +2070,7 @@ void __init mem_init(void) 
		prom_printf("paging_init: Cannot alloc zero page.\n");

		prom_halt();

	}

	SetPageReserved(mem_map_zero);

	mark_page_reserved(mem_map_zero);



	codepages = (((unsigned long) _etext) - ((unsigned long) _start));

	codepages = PAGE_ALIGN(codepages) >> PAGE_SHIFT;
@@ -2111,37 +2110,22 @@ void free_initmem(void) 
	initend = (unsigned long)(__init_end) & PAGE_MASK;

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

		unsigned long page;

		struct page *p;



		page = (addr +

			((unsigned long) __va(kern_base)) -

			((unsigned long) KERNBASE));

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



		if (do_free) {

			p = virt_to_page(page);



			ClearPageReserved(p);

			init_page_count(p);

			__free_page(p);

			totalram_pages++;

		}

		if (do_free)

			free_reserved_page(virt_to_page(page));

	}

}



#ifdef CONFIG_BLK_DEV_INITRD

void free_initrd_mem(unsigned long start, unsigned long end)

{

	if (start < end)

		printk ("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);

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

		struct page *p = virt_to_page(start);



		ClearPageReserved(p);

		init_page_count(p);

		__free_page(p);

		totalram_pages++;

	}

	num_physpages += free_reserved_area(start, end, POISON_FREE_INITMEM,

					    "initrd");

}

#endif