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

From: Catalin Marinas
Date: Wed Oct 06 2021 - 14:11:30 EST


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>
---

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