Merge tag 'for-5.12/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / arch / x86 / include / asm / elf.h

diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
index 66bdfe8..9224d40 100644 (file)
--- a/arch/x86/include/asm/elf.h
+++ b/arch/x86/include/asm/elf.h
@@ -364,7 +364,7 @@ do {                                                                        \
 #define COMPAT_ARCH_DLINFO                                             \
 if (exec->e_machine == EM_X86_64)                                      \
        ARCH_DLINFO_X32;                                                \
-else                                                                   \
+else if (IS_ENABLED(CONFIG_IA32_EMULATION))                            \
        ARCH_DLINFO_IA32
 
 #define COMPAT_ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)