[PATCH 02/12] x86/compat: Make mmap_is_ia32() common compat

2015-06-22 Thread Brian Gerst 
TIF_ADDR32 is set for both ia32 and x32 tasks, so change from
CONFIG_IA32_EMULATION to CONFIG_COMPAT.  Use config_enabled()
to make the function more readable.

Signed-off-by: Brian Gerst 
---
 arch/x86/include/asm/elf.h | 11 +++
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
index f161c18..180b6fe 100644
--- 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() */
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 02/12] x86/compat: Make mmap_is_ia32() common compat

2015-06-22 Thread Brian Gerst 
TIF_ADDR32 is set for both ia32 and x32 tasks, so change from
CONFIG_IA32_EMULATION to CONFIG_COMPAT.  Use config_enabled()
to make the function more readable.

Signed-off-by: Brian Gerst brge...@gmail.com
---
 arch/x86/include/asm/elf.h | 11 +++
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
index f161c18..180b6fe 100644
--- 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() */
-- 
2.1.0

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
Please read the FAQ at  http://www.tux.org/lkml/