diff options
| author | Thomas Weißschuh <linux@weissschuh.net> | 2025-10-28 10:15:37 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2025-11-06 13:02:33 +0100 |
| commit | c1b077515116dc7916dbf72d8803a682c5989aa6 (patch) | |
| tree | 9a688bb2607e501f912c5a3fe2c623d0fe66c084 | |
| parent | 74d438872dae44abfcfffad4daccd7f22cdf7bad (diff) | |
x86/um: Move ELF_PLATFORM fallback to x86-specific code
The generic UM code should not have references to x86-specific value.
Move the fallback into the x86-specific header.
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Link: https://patch.msgid.link/20251028-uml-remove-32bit-pseudo-vdso-v1-2-e930063eff5f@weissschuh.net
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | arch/um/os-Linux/elf_aux.c | 3 | ||||
| -rw-r--r-- | arch/x86/um/asm/elf.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/um/os-Linux/elf_aux.c b/arch/um/os-Linux/elf_aux.c index a62fe39e85c9..4aadb9ea5ae3 100644 --- a/arch/um/os-Linux/elf_aux.c +++ b/arch/um/os-Linux/elf_aux.c @@ -71,7 +71,4 @@ __init void scan_elf_aux( char **envp) else { vsyscall_end = vsyscall_ehdr + page_size; } - - if (!elf_aux_platform) - elf_aux_platform = "i586"; } diff --git a/arch/x86/um/asm/elf.h b/arch/x86/um/asm/elf.h index 62ed5d68a978..e7a045e01471 100644 --- a/arch/x86/um/asm/elf.h +++ b/arch/x86/um/asm/elf.h @@ -69,7 +69,8 @@ } while (0); extern char * elf_aux_platform; -#define ELF_PLATFORM (elf_aux_platform) +#define ELF_PLATFORM_FALLBACK "i586" +#define ELF_PLATFORM (elf_aux_platform ?: ELF_PLATFORM_FALLBACK) extern unsigned long vsyscall_ehdr; extern unsigned long vsyscall_end; |