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

Commit 5ec9407d authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Don't include asm/elf.h in asm code 



asm code really wants asm/hwcap.h, so include that instead.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9b727abd

arch/arm/include/asm/elf.h

+0 −4
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 


#include <asm/hwcap.h>



#ifndef __ASSEMBLY__

/*

 * ELF register definitions..

 */
@@ -17,7 +16,6 @@ typedef unsigned long elf_freg_t[3]; 
typedef elf_greg_t elf_gregset_t[ELF_NGREG];



typedef struct user_fp elf_fpregset_t;

#endif



#define EM_ARM	40

#define EF_ARM_APCS26 0x08
@@ -41,7 +39,6 @@ typedef struct user_fp elf_fpregset_t; 
#endif

#define ELF_ARCH	EM_ARM



#ifndef __ASSEMBLY__

/*

 * This yields a string that ld.so will use to load implementation

 * specific libraries for optimization.  This is more specific in
@@ -59,7 +56,6 @@ typedef struct user_fp elf_fpregset_t; 
#define ELF_PLATFORM	(elf_platform)



extern char elf_platform[];

#endif



/*

 * This is used to ensure we don't load something for the wrong architecture.

arch/arm/mm/proc-arm1020.S

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <linux/init.h>

#include <asm/assembler.h>

#include <asm/asm-offsets.h>

#include <asm/elf.h>

#include <asm/hwcap.h>

#include <asm/pgtable-hwdef.h>

#include <asm/pgtable.h>

#include <asm/ptrace.h>

arch/arm/mm/proc-arm1020e.S

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <linux/init.h>

#include <asm/assembler.h>

#include <asm/asm-offsets.h>

#include <asm/elf.h>

#include <asm/hwcap.h>

#include <asm/pgtable-hwdef.h>

#include <asm/pgtable.h>

#include <asm/ptrace.h>

arch/arm/mm/proc-arm1022.S

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/init.h>

#include <asm/assembler.h>

#include <asm/asm-offsets.h>

#include <asm/elf.h>

#include <asm/hwcap.h>

#include <asm/pgtable-hwdef.h>

#include <asm/pgtable.h>

#include <asm/ptrace.h>

arch/arm/mm/proc-arm1026.S

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/init.h>

#include <asm/assembler.h>

#include <asm/asm-offsets.h>

#include <asm/elf.h>

#include <asm/hwcap.h>

#include <asm/pgtable-hwdef.h>

#include <asm/pgtable.h>

#include <asm/ptrace.h>