x86/compat: Make mmap_is_ia32() common compat

[cascardo/linux.git] / arch / x86 / include / asm / elf.h

diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
index f161c18..180b6fe 100644 (file)
--- a/arch/x86/include/asm/elf.h
+++ b/arch/x86/include/asm/elf.h
@@ -344,14 +344,9 @@ extern int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
  */
 static inline int mmap_is_ia32(void)
 {
-#ifdef CONFIG_X86_32
-       return 1;
-#endif
-#ifdef CONFIG_IA32_EMULATION
-       if (test_thread_flag(TIF_ADDR32))
-               return 1;
-#endif
-       return 0;
+       return config_enabled(CONFIG_X86_32) ||
+              (config_enabled(CONFIG_COMPAT) &&
+               test_thread_flag(TIF_ADDR32));
 }
 
 /* Do not change the values. See get_align_mask() */