Re: [PATCH] elfcore: um: Fix CONFIG_UM typo in linux/elfcore.h

From: Nick Desaulniers
Date: Wed Oct 06 2021 - 17:58:12 EST


On Wed, Oct 6, 2021 at 11:11 AM Catalin Marinas <catalin.marinas@xxxxxxx> wrote:
>
> There is no CONFIG_UM, only UML. In addition, the arch/x86/um/elfcore.c
> file is only compiled if CONFIG_X86_32. Fix the #if conditions in the
> linux/elfcore.h header accordingly.
>
> Fixes: 6e7b64b9dd6d ("elfcore: fix building with clang")
> Signed-off-by: Catalin Marinas <catalin.marinas@xxxxxxx>
> Cc: Arnd Bergmann <arnd@xxxxxxxx>

Lukas noticed and sent a patch coincidentally just before you:
https://lore.kernel.org/lkml/20211006082209.417-1-lukas.bulwahn@xxxxxxxxx/

Let me cc' you and Arnd into that thread.

> ---
>
> I'm doing some arm64 changes to allow MTE tags to be dumped in the core
> file and I came across this. In a subsequent patch I'll change the #if
> check with a dedicated Kconfig option but I thought I'd send the fix
> first in case anyone deems it important to backport.
>
> 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..957ebec35aad 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_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



--
Thanks,
~Nick Desaulniers