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

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

mm/FRV: 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: David Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2e529815

arch/frv/mm/init.c

+4 −30
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ void __init mem_init(void) 
#endif

	int codek = 0, datak = 0;



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

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

	totalram_pages = free_all_bootmem();



#ifdef CONFIG_MMU
@@ -132,11 +132,7 @@ void __init mem_init(void) 


#ifdef CONFIG_HIGHMEM

	for (pfn = num_physpages - 1; pfn >= num_mappedpages; pfn--) {

		struct page *page = &mem_map[pfn];



		ClearPageReserved(page);

		init_page_count(page);

		__free_page(page);

		__free_reserved_page(&mem_map[pfn]);

		totalram_pages++;

	}

#endif
@@ -168,21 +164,7 @@ void __init mem_init(void) 
void free_initmem(void)

{

#if defined(CONFIG_RAMKERNEL) && !defined(CONFIG_PROTECT_KERNEL)

	unsigned long start, end, addr;



	start = PAGE_ALIGN((unsigned long) &__init_begin);	/* round up */

	end   = ((unsigned long) &__init_end) & PAGE_MASK;	/* round down */



	/* next to check that the page we free is not a partial page */

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

		ClearPageReserved(virt_to_page(addr));

		init_page_count(virt_to_page(addr));

		free_page(addr);

		totalram_pages++;

	}



	printk("Freeing unused kernel memory: %ldKiB freed (0x%lx - 0x%lx)\n",

	       (end - start) >> 10, start, end);

	free_initmem_default(0);

#endif

} /* end free_initmem() */
@@ -193,14 +175,6 @@ void free_initmem(void) 
#ifdef CONFIG_BLK_DEV_INITRD

void __init free_initrd_mem(unsigned long start, unsigned long end)

{

	int pages = 0;

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

		ClearPageReserved(virt_to_page(start));

		init_page_count(virt_to_page(start));

		free_page(start);

		totalram_pages++;

		pages++;

	}

	printk("Freeing initrd memory: %dKiB freed\n", (pages * PAGE_SIZE) >> 10);

	free_reserved_area(start, end, 0, "initrd");

} /* end free_initrd_mem() */

#endif