diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2007-05-02 19:27:08 +0200 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2007-05-02 19:27:08 +0200 |
| commit | 9f7290ed23b1cedf7198ef7b67f2ed256bc8553e (patch) | |
| tree | 98773236a40eacf0a60602ef9ff54bfcb3055120 | |
| parent | 5a90cf205c922707ffed2d8f87cefd942e96b0ba (diff) | |
| download | kernel_samsung_tuna-9f7290ed23b1cedf7198ef7b67f2ed256bc8553e.zip kernel_samsung_tuna-9f7290ed23b1cedf7198ef7b67f2ed256bc8553e.tar.gz kernel_samsung_tuna-9f7290ed23b1cedf7198ef7b67f2ed256bc8553e.tar.bz2 | |
[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: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| -rw-r--r-- | arch/x86_64/ia32/ia32_binfmt.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/x86_64/ia32/ia32_binfmt.c b/arch/x86_64/ia32/ia32_binfmt.c index 071100e..185399b 100644 --- a/arch/x86_64/ia32/ia32_binfmt.c +++ b/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> |