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

Commit bf589a34 authored by Kyle McMartin's avatar Kyle McMartin
Browse files

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: default avatarKyle McMartin <kyle@mcmartin.ca>
parent bb735019

arch/parisc/include/asm/elf.h

+10 −0
Original line number Diff line number Diff line
@@ -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)

arch/parisc/kernel/module.c

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

};