| From f8134aee9c7e3a4affe3a275512c46c5709836d0 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 9 Sep 2020 14:27:25 +0200 |
| Subject: s390/init: add missing __init annotations |
| |
| From: Ilya Leoshkevich <iii@linux.ibm.com> |
| |
| [ Upstream commit fcb2b70cdb194157678fb1a75f9ff499aeba3d2a ] |
| |
| Add __init to reserve_memory_end, reserve_oldmem and remove_oldmem. |
| Sometimes these functions are not inlined, and then the build |
| complains about section mismatch. |
| |
| Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> |
| Signed-off-by: Heiko Carstens <hca@linux.ibm.com> |
| Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/s390/kernel/setup.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c |
| index a559908d180ec..ce49c2b9db7ee 100644 |
| --- a/arch/s390/kernel/setup.c |
| +++ b/arch/s390/kernel/setup.c |
| @@ -529,7 +529,7 @@ static struct notifier_block kdump_mem_nb = { |
| /* |
| * Make sure that the area behind memory_end is protected |
| */ |
| -static void reserve_memory_end(void) |
| +static void __init reserve_memory_end(void) |
| { |
| #ifdef CONFIG_CRASH_DUMP |
| if (ipl_info.type == IPL_TYPE_FCP_DUMP && |
| @@ -547,7 +547,7 @@ static void reserve_memory_end(void) |
| /* |
| * Make sure that oldmem, where the dump is stored, is protected |
| */ |
| -static void reserve_oldmem(void) |
| +static void __init reserve_oldmem(void) |
| { |
| #ifdef CONFIG_CRASH_DUMP |
| if (OLDMEM_BASE) |
| @@ -559,7 +559,7 @@ static void reserve_oldmem(void) |
| /* |
| * Make sure that oldmem, where the dump is stored, is protected |
| */ |
| -static void remove_oldmem(void) |
| +static void __init remove_oldmem(void) |
| { |
| #ifdef CONFIG_CRASH_DUMP |
| if (OLDMEM_BASE) |
| -- |
| 2.25.1 |
| |
