Skip to contentSkip to conversation

elfcore: correct reference to CONFIG_UML

PATCH In review Lukas Bulwahn 3 participants 3 messages Oct 6, 2021 – Oct 7, 2021 Kernel janitors

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 elfcore: correct reference to CONFIG_UML

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

---
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(-)
include/linux/elfcore.h +1 -1
index 2aaa15779d50..127716b58235 100644
@@ -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
Signature · 1 line
2.26.2
#1 lore raw

+ Catalin who just sent a very similar patch after Lukas:
https://lore.kernel.org/lkml/[email protected]/
EOM

Quoted 44 lines · 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")

---
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(-)
include/linux/elfcore.h +1 -2
index 2aaa15779d50..127716b58235 100644
@@ -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

Signature · 2 lines
Thanks,
~Nick Desaulniers
#2 lore raw
Quoted 32 lines · 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")

---
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(-)
include/linux/elfcore.h +0 -0
index 2aaa15779d50..127716b58235 100644

include/linux/elfcore.h static inline int elf_core_copy_task_fpregs(struct task_struct *t, struct pt_reg · line 112

Quoted 5 lines
include/linux/elfcore.h +1 -1
@@ -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.

Signature · 1 line
Catalin