lkml.org 
[lkml]   [2020]   [Sep]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 329/388] s390/init: add missing __init annotations
    Date
    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 82ef081e7448e..61c02a162d378 100644
    --- a/arch/s390/kernel/setup.c
    +++ b/arch/s390/kernel/setup.c
    @@ -627,7 +627,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)
    {
    if (memory_end_set)
    memblock_reserve(memory_end, ULONG_MAX);
    @@ -636,7 +636,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)
    @@ -648,7 +648,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


    \
     
     \ /
      Last update: 2020-09-29 13:57    [W:4.113 / U:0.212 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site