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

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

mm/blackfin: 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: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c15da0a8

arch/blackfin/mm/init.c

+3 −19
Original line number Original line Diff line number Diff line
@@ -103,7 +103,7 @@ void __init mem_init(void) 
	max_mapnr = num_physpages = MAP_NR(high_memory);

	max_mapnr = num_physpages = MAP_NR(high_memory);

	printk(KERN_DEBUG "Kernel managed physical pages: %lu\n", num_physpages);

	printk(KERN_DEBUG "Kernel managed physical pages: %lu\n", num_physpages);





	/* This will put all memory onto the freelists. */

	/* This will put all low memory onto the freelists. */

	totalram_pages = free_all_bootmem();

	totalram_pages = free_all_bootmem();





	reservedpages = 0;

	reservedpages = 0;
@@ -129,24 +129,11 @@ void __init mem_init(void) 
		initk, codek, datak, DMA_UNCACHED_REGION >> 10, (reservedpages << (PAGE_SHIFT-10)));

		initk, codek, datak, DMA_UNCACHED_REGION >> 10, (reservedpages << (PAGE_SHIFT-10)));

}

}





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

{

	unsigned long addr;

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

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

		ClearPageReserved(virt_to_page(addr));

		init_page_count(virt_to_page(addr));

		free_page(addr);

		totalram_pages++;

	}

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

}



#ifdef CONFIG_BLK_DEV_INITRD

#ifdef CONFIG_BLK_DEV_INITRD

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

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

{

{

#ifndef CONFIG_MPU

#ifndef CONFIG_MPU

	free_init_pages("initrd memory", start, end);

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

#endif

#endif

}

}

#endif

#endif
@@ -154,10 +141,7 @@ void __init free_initrd_mem(unsigned long start, unsigned long end) 
void __init_refok free_initmem(void)

void __init_refok free_initmem(void)

{

{

#if defined CONFIG_RAMKERNEL && !defined CONFIG_MPU

#if defined CONFIG_RAMKERNEL && !defined CONFIG_MPU

	free_init_pages("unused kernel memory",

	free_initmem_default(0);

			(unsigned long)(&__init_begin),

			(unsigned long)(&__init_end));



	if (memory_start == (unsigned long)(&__init_end))

	if (memory_start == (unsigned long)(&__init_end))

		memory_start = (unsigned long)(&__init_begin);

		memory_start = (unsigned long)(&__init_begin);

#endif

#endif