lkml.org 
[lkml]   [2021]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 48/95] elfcore: correct reference to CONFIG_UML
    Date
    From: Lukas Bulwahn <lukas.bulwahn@gmail.com>

    commit b0e901280d9860a0a35055f220e8e457f300f40a upstream.

    Commit 6e7b64b9dd6d ("elfcore: fix building with clang") introduces
    special handling for two architectures, ia64 and User Mode Linux.
    However, the wrong name, i.e., CONFIG_UM, for the intended Kconfig
    symbol for User-Mode Linux was used.

    Although the directory for User Mode Linux is ./arch/um; the Kconfig
    symbol for this architecture is called CONFIG_UML.

    Luckily, ./scripts/checkkconfigsymbols.py warns on non-existing configs:

    UM
    Referencing files: include/linux/elfcore.h
    Similar symbols: UML, NUMA

    Correct the name of the config to the intended one.

    [akpm@linux-foundation.org: fix um/x86_64, per Catalin]
    Link: https://lkml.kernel.org/r/20211006181119.2851441-1-catalin.marinas@arm.com
    Link: https://lkml.kernel.org/r/YV6pejGzLy5ppEpt@arm.com

    Link: https://lkml.kernel.org/r/20211006082209.417-1-lukas.bulwahn@gmail.com
    Fixes: 6e7b64b9dd6d ("elfcore: fix building with clang")
    Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Cc: Nathan Chancellor <nathan@kernel.org>
    Cc: Nick Desaulniers <ndesaulniers@google.com>
    Cc: Catalin Marinas <catalin.marinas@arm.com>
    Cc: Barret Rhoden <brho@google.com>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    include/linux/elfcore.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/include/linux/elfcore.h
    +++ b/include/linux/elfcore.h
    @@ -104,7 +104,7 @@ static inline int elf_core_copy_task_fpr
    #endif
    }

    -#if defined(CONFIG_UM) || defined(CONFIG_IA64)
    +#if (defined(CONFIG_UML) && defined(CONFIG_X86_32)) || defined(CONFIG_IA64)
    /*
    * These functions parameterize elf_core_dump in fs/binfmt_elf.c to write out
    * extra segments containing the gate DSO contents. Dumping its

    \
     
     \ /
      Last update: 2021-10-25 22:10    [W:2.458 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site