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

Commit 2773fcc8 authored by Dave Carroll's avatar Dave Carroll Committed by Benjamin Herrenschmidt
Browse files

powerpc: Move free_initmem to common code 



The free_initmem function is basically duplicated in mm/init_32,
and init_64, and is moved to the common 32/64-bit mm/mem.c.

All other sections except init were removed in v2.6.15 by
6c45ab99 (powerpc: Remove section
free() and linker script bits), and therefore the bulk of the executed
code is identical.

This patch also removes updating ppc_md.progress to NULL in the powermac
late_initcall.

Suggested-by: default avatarMilton Miller <miltonm@bga.com>
Suggested-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarDave Carroll <dcarroll@astekcorp.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 6da49a29

arch/powerpc/mm/init_32.c

+0 −32
Original line number Diff line number Diff line
@@ -191,38 +191,6 @@ void __init *early_get_page(void) 
		return __va(memblock_alloc(PAGE_SIZE, PAGE_SIZE));

}



/* Free up now-unused memory */

static void free_sec(unsigned long start, unsigned long end, const char *name)

{

	unsigned long cnt = 0;



	while (start < end) {

		ClearPageReserved(virt_to_page(start));

		init_page_count(virt_to_page(start));

		free_page(start);

		cnt++;

		start += PAGE_SIZE;

 	}

	if (cnt) {

		printk(" %ldk %s", cnt << (PAGE_SHIFT - 10), name);

		totalram_pages += cnt;

	}

}



void free_initmem(void)

{

#define FREESEC(TYPE) \

	free_sec((unsigned long)(&__ ## TYPE ## _begin), \

		 (unsigned long)(&__ ## TYPE ## _end), \

		 #TYPE);



	printk ("Freeing unused kernel memory:");

	FREESEC(init);

 	printk("\n");

	ppc_md.progress = NULL;

#undef FREESEC

}



#ifdef CONFIG_8xx /* No 8xx specific .c file to put that in ... */

void setup_initial_memory_limit(phys_addr_t first_memblock_base,

				phys_addr_t first_memblock_size)

arch/powerpc/mm/init_64.c

+0 −16
Original line number Diff line number Diff line
@@ -83,22 +83,6 @@ EXPORT_SYMBOL_GPL(memstart_addr); 
phys_addr_t kernstart_addr;

EXPORT_SYMBOL_GPL(kernstart_addr);



void free_initmem(void)

{

	unsigned long addr;



	addr = (unsigned long)__init_begin;

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

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

		ClearPageReserved(virt_to_page(addr));

		init_page_count(virt_to_page(addr));

		free_page(addr);

		totalram_pages++;

	}

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

		((unsigned long)__init_end - (unsigned long)__init_begin) >> 10);

}



static void pgd_ctor(void *addr)

{

	memset(addr, 0, PGD_TABLE_SIZE);

arch/powerpc/mm/mem.c

+19 −0
Original line number Diff line number Diff line
@@ -383,6 +383,25 @@ void __init mem_init(void) 
	mem_init_done = 1;

}



void free_initmem(void)

{

	unsigned long addr;



	ppc_md.progress = NULL;



	addr = (unsigned long)__init_begin;

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

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

		ClearPageReserved(virt_to_page(addr));

		init_page_count(virt_to_page(addr));

		free_page(addr);

		totalram_pages++;

	}

	pr_info("Freeing unused kernel memory: %luk freed\n",

		((unsigned long)__init_end -

		(unsigned long)__init_begin) >> 10);

}



#ifdef CONFIG_BLK_DEV_INITRD

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

{

arch/powerpc/platforms/powermac/setup.c

+0 −3
Original line number Diff line number Diff line
@@ -355,9 +355,6 @@ static int initializing = 1; 
static int pmac_late_init(void)

{

	initializing = 0;

	/* this is udbg (which is __init) and we can later use it during

	 * cpu hotplug (in smp_core99_kick_cpu) */

	ppc_md.progress = NULL;

	return 0;

}

machine_late_initcall(powermac, pmac_late_init);