* [PATCH] elfcore: correct reference to CONFIG_UML
@ 2021-10-06 8:22 Lukas Bulwahn
2021-10-06 21:58 ` Nick Desaulniers
0 siblings, 1 reply; 3+ messages in thread
From: Lukas Bulwahn @ 2021-10-06 8:22 UTC (permalink / raw)
To: Andrew Morton, Arnd Bergmann, linux-kernel
Cc: Nathan Chancellor, Nick Desaulniers, llvm, kernel-janitors,
Lukas Bulwahn
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.
Fixes: 6e7b64b9dd6d ("elfcore: fix building with clang")
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
---
applies cleanly on next-20211005
Arnd, please ack.
Andrew, please pick this fix.
include/linux/elfcore.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/elfcore.h b/include/linux/elfcore.h
index 2aaa15779d50..127716b58235 100644
--- a/include/linux/elfcore.h
+++ b/include/linux/elfcore.h
@@ -109,7 +109,7 @@ static inline int elf_core_copy_task_fpregs(struct task_struct *t, struct pt_reg
#endif
}
-#if defined(CONFIG_UM) || defined(CONFIG_IA64)
+#if defined(CONFIG_UML) || 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
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] elfcore: correct reference to CONFIG_UML
2021-10-06 8:22 [PATCH] elfcore: correct reference to CONFIG_UML Lukas Bulwahn
@ 2021-10-06 21:58 ` Nick Desaulniers
2021-10-07 8:02 ` Catalin Marinas
0 siblings, 1 reply; 3+ messages in thread
From: Nick Desaulniers @ 2021-10-06 21:58 UTC (permalink / raw)
To: Lukas Bulwahn
Cc: Andrew Morton, Arnd Bergmann, linux-kernel, Nathan Chancellor,
llvm, kernel-janitors, Catalin Marinas
+ Catalin who just sent a very similar patch after Lukas:
https://lore.kernel.org/lkml/20211006181119.2851441-1-catalin.marinas@arm.com/
EOM
On Wed, Oct 6, 2021 at 1:22 AM Lukas Bulwahn <lukas.bulwahn@gmail.com> wrote:
>
> 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.
>
> Fixes: 6e7b64b9dd6d ("elfcore: fix building with clang")
> Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
> ---
> applies cleanly on next-20211005
>
> Arnd, please ack.
> Andrew, please pick this fix.
>
> include/linux/elfcore.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/elfcore.h b/include/linux/elfcore.h
> index 2aaa15779d50..127716b58235 100644
> --- a/include/linux/elfcore.h
> +++ b/include/linux/elfcore.h
> @@ -109,7 +109,7 @@ static inline int elf_core_copy_task_fpregs(struct task_struct *t, struct pt_reg
> #endif
> }
>
> -#if defined(CONFIG_UM) || defined(CONFIG_IA64)
> +#if defined(CONFIG_UML) || 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
> --
> 2.26.2
>
--
Thanks,
~Nick Desaulniers
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] elfcore: correct reference to CONFIG_UML
2021-10-06 21:58 ` Nick Desaulniers
@ 2021-10-07 8:02 ` Catalin Marinas
0 siblings, 0 replies; 3+ messages in thread
From: Catalin Marinas @ 2021-10-07 8:02 UTC (permalink / raw)
To: Nick Desaulniers
Cc: Lukas Bulwahn, Andrew Morton, Arnd Bergmann, linux-kernel,
Nathan Chancellor, llvm, kernel-janitors
On Wed, Oct 6, 2021 at 1:22 AM Lukas Bulwahn <lukas.bulwahn@gmail.com> wrote:
> 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.
>
> Fixes: 6e7b64b9dd6d ("elfcore: fix building with clang")
> Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
> ---
> applies cleanly on next-20211005
>
> Arnd, please ack.
> Andrew, please pick this fix.
>
> include/linux/elfcore.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/elfcore.h b/include/linux/elfcore.h
> index 2aaa15779d50..127716b58235 100644
> --- a/include/linux/elfcore.h
> +++ b/include/linux/elfcore.h
> @@ -109,7 +109,7 @@ static inline int elf_core_copy_task_fpregs(struct task_struct *t, struct pt_reg
> #endif
> }
>
> -#if defined(CONFIG_UM) || defined(CONFIG_IA64)
> +#if defined(CONFIG_UML) || defined(CONFIG_IA64)
This fails to build with 'make ARCH=um SUBARCH=x86_64' since
arch/x86/um/elfcore.c is only compiled for x86_32. You'd need another
check on CONFIG_X86_32 (as per my patch ;)).
Thanks.
--
Catalin
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-07 8:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-06 8:22 [PATCH] elfcore: correct reference to CONFIG_UML Lukas Bulwahn
2021-10-06 21:58 ` Nick Desaulniers
2021-10-07 8:02 ` Catalin Marinas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).