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

Commit 386d9a7e authored by Magnus Damm's avatar Magnus Damm Committed by Linus Torvalds
Browse files

[PATCH] elf: Always define elf_addr_t in linux/elf.h 



Define elf_addr_t in linux/elf.h.  The size of the type is determined using
ELF_CLASS.  This allows us to remove the defines that today are spread all
over .c and .h files.

Signed-off-by: default avatarMagnus Damm <magnus@valinux.co.jp>
Cc: Daniel Jacobowitz <drow@false.org>
Cc: Roland McGrath <roland@redhat.com>
Cc: Jakub Jelinek <jakub@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 651971cb

arch/ia64/ia32/ia32priv.h

+0 −2
Original line number Diff line number Diff line
@@ -330,8 +330,6 @@ struct old_linux32_dirent { 
void ia64_elf32_init(struct pt_regs *regs);

#define ELF_PLAT_INIT(_r, load_addr)	ia64_elf32_init(_r)



#define elf_addr_t	u32



/* This macro yields a bitmask that programs can use to figure out

   what instruction set this CPU supports.  */

#define ELF_HWCAP	0

arch/mips/kernel/binfmt_elfn32.c

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ struct elf_prpsinfo32 
	char	pr_psargs[ELF_PRARGSZ];	/* initial part of arg list */

};



#define elf_addr_t	u32

#define elf_caddr_t	u32

#define init_elf_binfmt init_elfn32_binfmt

arch/mips/kernel/binfmt_elfo32.c

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ struct elf_prpsinfo32 
	char	pr_psargs[ELF_PRARGSZ];	/* initial part of arg list */

};



#define elf_addr_t	u32

#define elf_caddr_t	u32

#define init_elf_binfmt init_elf32_binfmt

arch/mips/kernel/irixelf.c

+0 −4
Original line number Diff line number Diff line
@@ -52,10 +52,6 @@ static struct linux_binfmt irix_format = { 
	irix_core_dump, PAGE_SIZE

};



#ifndef elf_addr_t

#define elf_addr_t unsigned long

#endif



#ifdef DEBUG

/* Debugging routines. */

static char *get_elf_p_type(Elf32_Word p_type)

arch/parisc/kernel/binfmt_elf32.c

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ struct elf_prpsinfo32 
	char	pr_psargs[ELF_PRARGSZ];	/* initial part of arg list */

};



#define elf_addr_t	unsigned int

#define init_elf_binfmt init_elf32_binfmt



#define ELF_PLATFORM  ("PARISC32\0")