aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/mm
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2012-09-24 08:17:58 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2012-09-26 15:45:27 +0200
commit5e249d6e11bd92161d2dcb92691b0a6ec361627a (patch)
treebef2a7f54a50dc253a5515c4f9ac28b0b246b953 /arch/s390/mm
parent3bc9fef9cc1e4047c3a3c51d84cc1c5d2ef03cea (diff)
downloadkernel_goldelico_gta04-5e249d6e11bd92161d2dcb92691b0a6ec361627a.zip
kernel_goldelico_gta04-5e249d6e11bd92161d2dcb92691b0a6ec361627a.tar.gz
kernel_goldelico_gta04-5e249d6e11bd92161d2dcb92691b0a6ec361627a.tar.bz2
s390/mm: mark free_initrd_mem() as __init
Same as 0d26d1d8 "x86/mm: Mark free_initrd_mem() as __init". In addition also add the __init annotation to setup_zero_pages(). Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/mm')
-rw-r--r--arch/s390/mm/init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 6adbc08..81e596c 100644
--- a/arch/s390/mm/init.c
+++ b/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);
}