From d50e6d2f5f6697f5086470d1339b1933a7302453 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Mon, 24 Sep 2012 08:17:58 +0200 Subject: [PATCH] --- yaml --- r: 324117 b: refs/heads/master c: 5e249d6e11bd92161d2dcb92691b0a6ec361627a h: refs/heads/master i: 324115: 0fcab289e1134d4208fef05147b99dc500f0b600 v: v3 --- [refs] | 2 +- trunk/arch/s390/mm/init.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f8759a594963..efeb3528df62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3bc9fef9cc1e4047c3a3c51d84cc1c5d2ef03cea +refs/heads/master: 5e249d6e11bd92161d2dcb92691b0a6ec361627a diff --git a/trunk/arch/s390/mm/init.c b/trunk/arch/s390/mm/init.c index 6adbc082618a..81e596c65dee 100644 --- a/trunk/arch/s390/mm/init.c +++ b/trunk/arch/s390/mm/init.c @@ -42,7 +42,7 @@ 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 setup_zero_pages(void) +static unsigned long __init setup_zero_pages(void) { struct cpuid cpu_id; unsigned int order; @@ -212,7 +212,7 @@ void free_initmem(void) } #ifdef CONFIG_BLK_DEV_INITRD -void free_initrd_mem(unsigned long start, unsigned long end) +void __init free_initrd_mem(unsigned long start, unsigned long end) { free_init_pages("initrd memory", start, end); }