Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f7290ed authored by Ralf Baechle's avatar Ralf Baechle Committed by Andi Kleen
Browse files

[PATCH] x86-64: fix ia32_binfmt.c build error 



Reorder code to avoid multiple inclusion of elf.h.

#undef several symbols to avoid build errors over redefinitions.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 5a90cf20

arch/x86_64/ia32/ia32_binfmt.c

+6 −4
Original line number Diff line number Diff line
@@ -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>