lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

parisc: Move kernel Elf_Fdesc define to <asm/elf.h>

Browse Source 
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>
This commit is contained in:
Kyle McMartin
2009-03-15 16:44:25 -04:00
parent bb73501941
commit bf589a349b
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/parisc/include/asm/elf.h
View File

@@ -168,6 +168,16 @@ typedef struct elf64_fdesc {
__u64 gp; __u64 gp;
} Elf64_Fdesc; } 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. */ /* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr. */
#define PT_HP_TLS (PT_LOOS + 0x0) #define PT_HP_TLS (PT_LOOS + 0x0)

4
arch/parisc/kernel/module.c
View File

@@ -115,8 +115,6 @@ struct got_entry {
Elf32_Addr addr; Elf32_Addr addr;
}; };
#define Elf_Fdesc Elf32_Fdesc
struct stub_entry { struct stub_entry {
Elf32_Word insns[2]; /* each stub entry has two insns */ Elf32_Word insns[2]; /* each stub entry has two insns */
}; };
@@ -125,8 +123,6 @@ struct got_entry {
Elf64_Addr addr; Elf64_Addr addr;
}; };
#define Elf_Fdesc Elf64_Fdesc
struct stub_entry { struct stub_entry {
Elf64_Word insns[4]; /* each stub entry has four insns */ Elf64_Word insns[4]; /* each stub entry has four insns */
}; };