diff options
| author | Kyle McMartin <kyle@mcmartin.ca> | 2009-03-15 21:44:25 +0100 |
|---|---|---|
| committer | Kyle McMartin <kyle@mcmartin.ca> | 2009-04-02 06:16:24 +0200 |
| commit | bf589a349b9a41ea202ddb8115b18f543b944bfd (patch) | |
| tree | b7b629d5f94b331ccf4b7c114c783675696d4dfd /arch/parisc | |
| parent | parisc: fix build when ARCH_HAS_KMAP (diff) | |
| download | linux-bf589a349b9a41ea202ddb8115b18f543b944bfd.tar.xz linux-bf589a349b9a41ea202ddb8115b18f543b944bfd.zip | |
parisc: Move kernel Elf_Fdesc define to <asm/elf.h>
elf.h probably won't be exported to userspace, but play it safe
and cram it in a #ifdef __KERNEL__ guard.
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/include/asm/elf.h | 10 | ||||
| -rw-r--r-- | arch/parisc/kernel/module.c | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h index 7fa675799e6d..9c802eb4be84 100644 --- a/arch/parisc/include/asm/elf.h +++ b/arch/parisc/include/asm/elf.h @@ -168,6 +168,16 @@ typedef struct elf64_fdesc { __u64 gp; } Elf64_Fdesc; +#ifdef __KERNEL__ + +#ifdef CONFIG_64BIT +#define Elf_Fdesc Elf64_Fdesc +#else +#define Elf_Fdesc Elf32_Fdesc +#endif /*CONFIG_64BIT*/ + +#endif /*__KERNEL__*/ + /* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr. */ #define PT_HP_TLS (PT_LOOS + 0x0) diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c index 9013243cecca..3439cbd896b5 100644 --- a/arch/parisc/kernel/module.c +++ b/arch/parisc/kernel/module.c @@ -115,8 +115,6 @@ struct got_entry { Elf32_Addr addr; }; -#define Elf_Fdesc Elf32_Fdesc - struct stub_entry { Elf32_Word insns[2]; /* each stub entry has two insns */ }; @@ -125,8 +123,6 @@ struct got_entry { Elf64_Addr addr; }; -#define Elf_Fdesc Elf64_Fdesc - struct stub_entry { Elf64_Word insns[4]; /* each stub entry has four insns */ }; |