Merge commit 'b8c93646fd5c' into omap-for-v4.3/fixes

[karo-tx-linux.git] / arch / arm64 / mm / init.c

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index ad87ce826cce45ec0ac710c4dc1b721d8aaa8f97..f5c0680d17d9efd701f7c261fd3a8b0210ad9d7a 100644 (file)
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -358,9 +358,9 @@ void free_initmem(void)
 
 #ifdef CONFIG_BLK_DEV_INITRD
 
-static int keep_initrd;
+static int keep_initrd __initdata;
 
-void free_initrd_mem(unsigned long start, unsigned long end)
+void __init free_initrd_mem(unsigned long start, unsigned long end)
 {
        if (!keep_initrd)
                free_reserved_area((void *)start, (void *)end, 0, "initrd");