From f0435501ad7d73a22c383b141147c14a90778dba Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 2 May 2007 19:27:08 +0200
Subject: [PATCH] --- yaml --- r: 53789 b: refs/heads/master c:
 9f7290ed23b1cedf7198ef7b67f2ed256bc8553e h: refs/heads/master i:   53787:
 ad6476557b870772a71ab141d8444081e65a4f17 v: v3

---
 [refs]                               |  2 +-
 trunk/arch/x86_64/ia32/ia32_binfmt.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index de0028ed53bb..e5630e17b643 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a90cf205c922707ffed2d8f87cefd942e96b0ba
+refs/heads/master: 9f7290ed23b1cedf7198ef7b67f2ed256bc8553e
diff --git a/trunk/arch/x86_64/ia32/ia32_binfmt.c b/trunk/arch/x86_64/ia32/ia32_binfmt.c
index 071100ea1251..185399baaf6d 100644
--- a/trunk/arch/x86_64/ia32/ia32_binfmt.c
+++ b/trunk/arch/x86_64/ia32/ia32_binfmt.c
@@ -5,6 +5,11 @@
  * This tricks binfmt_elf.c into loading 32bit binaries using lots 
  * of ugly preprocessor tricks. Talk about very very poor man's inheritance.
  */ 
+#define __ASM_X86_64_ELF_H 1
+
+#undef ELF_CLASS
+#define ELF_CLASS ELFCLASS32
+
 #include <linux/types.h>
 #include <linux/stddef.h>
 #include <linux/rwsem.h>
@@ -50,9 +55,6 @@ struct elf_phdr;
 #undef ELF_ARCH
 #define ELF_ARCH EM_386
 
-#undef ELF_CLASS
-#define ELF_CLASS ELFCLASS32
-
 #define ELF_DATA	ELFDATA2LSB
 
 #define USE_ELF_CORE_DUMP 1
@@ -136,7 +138,7 @@ struct elf_prpsinfo
 
 #define user user32
 
-#define __ASM_X86_64_ELF_H 1
+#undef elf_read_implies_exec
 #define elf_read_implies_exec(ex, executable_stack)     (executable_stack != EXSTACK_DISABLE_X)
 //#include <asm/ia32.h>
 #include <linux/elf.h>