Patch "powerpc/fadump: Mark fadump_calculate_reserve_size as __init" has been added to the 5.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    powerpc/fadump: Mark fadump_calculate_reserve_size as __init

to the 5.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     powerpc-fadump-mark-fadump_calculate_reserve_size-as.patch
and it can be found in the queue-5.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 35fab735662880c102f79eb9f92342a4f23a72d0
Author: Nathan Chancellor <nathan@xxxxxxxxxx>
Date:   Tue Mar 2 12:50:14 2021 -0700

    powerpc/fadump: Mark fadump_calculate_reserve_size as __init
    
    [ Upstream commit fbced1546eaaab57a32e56c974ea8acf10c6abd8 ]
    
    If fadump_calculate_reserve_size() is not inlined, there is a modpost
    warning:
    
    WARNING: modpost: vmlinux.o(.text+0x5196c): Section mismatch in
    reference from the function fadump_calculate_reserve_size() to the
    function .init.text:parse_crashkernel()
    The function fadump_calculate_reserve_size() references
    the function __init parse_crashkernel().
    This is often because fadump_calculate_reserve_size lacks a __init
    annotation or the annotation of parse_crashkernel is wrong.
    
    fadump_calculate_reserve_size() calls parse_crashkernel(), which is
    marked as __init and fadump_calculate_reserve_size() is called from
    within fadump_reserve_mem(), which is also marked as __init.
    
    Mark fadump_calculate_reserve_size() as __init to fix the section
    mismatch. Additionally, remove the inline keyword as it is not necessary
    to inline this function; the compiler is still free to do so if it feels
    it is worthwhile since commit 889b3c1245de ("compiler: remove
    CONFIG_OPTIMIZE_INLINING entirely").
    
    Fixes: 11550dc0a00b ("powerpc/fadump: reuse crashkernel parameter for fadump memory reservation")
    Signed-off-by: Nathan Chancellor <nathan@xxxxxxxxxx>
    Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
    Link: https://github.com/ClangBuiltLinux/linux/issues/1300
    Link: https://lore.kernel.org/r/20210302195013.2626335-1-nathan@xxxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
index 8482739d42f3..eddf362caedc 100644
--- a/arch/powerpc/kernel/fadump.c
+++ b/arch/powerpc/kernel/fadump.c
@@ -292,7 +292,7 @@ static void fadump_show_config(void)
  * that is required for a kernel to boot successfully.
  *
  */
-static inline u64 fadump_calculate_reserve_size(void)
+static __init u64 fadump_calculate_reserve_size(void)
 {
 	u64 base, size, bootmem_min;
 	int ret;