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

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

mm/s390: 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: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5d585e5c

arch/s390/mm/init.c

+6 −29
Original line number Diff line number Diff line
@@ -42,11 +42,10 @@ pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__((__aligned__(PAGE_SIZE))); 
unsigned long empty_zero_page, zero_page_mask;

EXPORT_SYMBOL(empty_zero_page);



static unsigned long __init setup_zero_pages(void)

static void __init setup_zero_pages(void)

{

	struct cpuid cpu_id;

	unsigned int order;

	unsigned long size;

	struct page *page;

	int i;
@@ -83,14 +82,11 @@ static unsigned long __init setup_zero_pages(void) 
	page = virt_to_page((void *) empty_zero_page);

	split_page(page, order);

	for (i = 1 << order; i > 0; i--) {

		SetPageReserved(page);

		mark_page_reserved(page);

		page++;

	}



	size = PAGE_SIZE << order;

	zero_page_mask = (size - 1) & PAGE_MASK;



	return 1UL << order;

	zero_page_mask = ((PAGE_SIZE << order) - 1) & PAGE_MASK;

}



/*
@@ -147,7 +143,7 @@ void __init mem_init(void) 


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

	totalram_pages += free_all_bootmem();

	totalram_pages -= setup_zero_pages();	/* Setup zeroed pages. */

	setup_zero_pages();	/* Setup zeroed pages. */



	reservedpages = 0;
@@ -166,34 +162,15 @@ void __init mem_init(void) 
	       PFN_ALIGN((unsigned long)&_eshared) - 1);

}



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

{

	unsigned long addr = begin;



	if (begin >= end)

		return;

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

		ClearPageReserved(virt_to_page(addr));

		init_page_count(virt_to_page(addr));

		memset((void *)(addr & PAGE_MASK), POISON_FREE_INITMEM,

		       PAGE_SIZE);

		free_page(addr);

		totalram_pages++;

	}

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

}



void free_initmem(void)

{

	free_init_pages("unused kernel memory",

			(unsigned long)&__init_begin,

			(unsigned long)&__init_end);

	free_initmem_default(0);

}



#ifdef CONFIG_BLK_DEV_INITRD

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

{

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

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

}

#endif