Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Russell King and committed by
Russell King
5ec9407d 9b727abd

+22 -26
-4
arch/arm/include/asm/elf.h
··· 3 3 4 4 #include <asm/hwcap.h> 5 5 6 - #ifndef __ASSEMBLY__ 7 6 /* 8 7 * ELF register definitions.. 9 8 */ ··· 16 17 typedef elf_greg_t elf_gregset_t[ELF_NGREG]; 17 18 18 19 typedef struct user_fp elf_fpregset_t; 19 - #endif 20 20 21 21 #define EM_ARM 40 22 22 #define EF_ARM_APCS26 0x08 ··· 39 41 #endif 40 42 #define ELF_ARCH EM_ARM 41 43 42 - #ifndef __ASSEMBLY__ 43 44 /* 44 45 * This yields a string that ld.so will use to load implementation 45 46 * specific libraries for optimization. This is more specific in ··· 56 59 #define ELF_PLATFORM (elf_platform) 57 60 58 61 extern char elf_platform[]; 59 - #endif 60 62 61 63 /* 62 64 * This is used to ensure we don't load something for the wrong architecture.
+1 -1
arch/arm/mm/proc-arm1020.S
··· 29 29 #include <linux/init.h> 30 30 #include <asm/assembler.h> 31 31 #include <asm/asm-offsets.h> 32 - #include <asm/elf.h> 32 + #include <asm/hwcap.h> 33 33 #include <asm/pgtable-hwdef.h> 34 34 #include <asm/pgtable.h> 35 35 #include <asm/ptrace.h>
+1 -1
arch/arm/mm/proc-arm1020e.S
··· 29 29 #include <linux/init.h> 30 30 #include <asm/assembler.h> 31 31 #include <asm/asm-offsets.h> 32 - #include <asm/elf.h> 32 + #include <asm/hwcap.h> 33 33 #include <asm/pgtable-hwdef.h> 34 34 #include <asm/pgtable.h> 35 35 #include <asm/ptrace.h>
+1 -1
arch/arm/mm/proc-arm1022.S
··· 18 18 #include <linux/init.h> 19 19 #include <asm/assembler.h> 20 20 #include <asm/asm-offsets.h> 21 - #include <asm/elf.h> 21 + #include <asm/hwcap.h> 22 22 #include <asm/pgtable-hwdef.h> 23 23 #include <asm/pgtable.h> 24 24 #include <asm/ptrace.h>
+1 -1
arch/arm/mm/proc-arm1026.S
··· 18 18 #include <linux/init.h> 19 19 #include <asm/assembler.h> 20 20 #include <asm/asm-offsets.h> 21 - #include <asm/elf.h> 21 + #include <asm/hwcap.h> 22 22 #include <asm/pgtable-hwdef.h> 23 23 #include <asm/pgtable.h> 24 24 #include <asm/ptrace.h>
+1 -1
arch/arm/mm/proc-arm6_7.S
··· 15 15 #include <linux/init.h> 16 16 #include <asm/assembler.h> 17 17 #include <asm/asm-offsets.h> 18 - #include <asm/elf.h> 18 + #include <asm/hwcap.h> 19 19 #include <asm/pgtable-hwdef.h> 20 20 #include <asm/pgtable.h> 21 21 #include <asm/ptrace.h>
+1 -1
arch/arm/mm/proc-arm720.S
··· 36 36 #include <linux/init.h> 37 37 #include <asm/assembler.h> 38 38 #include <asm/asm-offsets.h> 39 - #include <asm/elf.h> 39 + #include <asm/hwcap.h> 40 40 #include <asm/pgtable-hwdef.h> 41 41 #include <asm/pgtable.h> 42 42 #include <asm/ptrace.h>
+1 -1
arch/arm/mm/proc-arm740.S
··· 12 12 #include <linux/init.h> 13 13 #include <asm/assembler.h> 14 14 #include <asm/asm-offsets.h> 15 - #include <asm/elf.h> 15 + #include <asm/hwcap.h> 16 16 #include <asm/pgtable-hwdef.h> 17 17 #include <asm/pgtable.h> 18 18 #include <asm/ptrace.h>
+1 -1
arch/arm/mm/proc-arm7tdmi.S
··· 12 12 #include <linux/init.h> 13 13 #include <asm/assembler.h> 14 14 #include <asm/asm-offsets.h> 15 - #include <asm/elf.h> 15 + #include <asm/hwcap.h> 16 16 #include <asm/pgtable-hwdef.h> 17 17 #include <asm/pgtable.h> 18 18 #include <asm/ptrace.h>
+1 -1
arch/arm/mm/proc-arm920.S
··· 28 28 #include <linux/linkage.h> 29 29 #include <linux/init.h> 30 30 #include <asm/assembler.h> 31 - #include <asm/elf.h> 31 + #include <asm/hwcap.h> 32 32 #include <asm/pgtable-hwdef.h> 33 33 #include <asm/pgtable.h> 34 34 #include <asm/page.h>
+1 -1
arch/arm/mm/proc-arm922.S
··· 29 29 #include <linux/linkage.h> 30 30 #include <linux/init.h> 31 31 #include <asm/assembler.h> 32 - #include <asm/elf.h> 32 + #include <asm/hwcap.h> 33 33 #include <asm/pgtable-hwdef.h> 34 34 #include <asm/pgtable.h> 35 35 #include <asm/page.h>
+1 -1
arch/arm/mm/proc-arm925.S
··· 52 52 #include <linux/linkage.h> 53 53 #include <linux/init.h> 54 54 #include <asm/assembler.h> 55 - #include <asm/elf.h> 55 + #include <asm/hwcap.h> 56 56 #include <asm/pgtable-hwdef.h> 57 57 #include <asm/pgtable.h> 58 58 #include <asm/page.h>
+1 -1
arch/arm/mm/proc-arm926.S
··· 28 28 #include <linux/linkage.h> 29 29 #include <linux/init.h> 30 30 #include <asm/assembler.h> 31 - #include <asm/elf.h> 31 + #include <asm/hwcap.h> 32 32 #include <asm/pgtable-hwdef.h> 33 33 #include <asm/pgtable.h> 34 34 #include <asm/page.h>
+1 -1
arch/arm/mm/proc-arm940.S
··· 11 11 #include <linux/linkage.h> 12 12 #include <linux/init.h> 13 13 #include <asm/assembler.h> 14 - #include <asm/elf.h> 14 + #include <asm/hwcap.h> 15 15 #include <asm/pgtable-hwdef.h> 16 16 #include <asm/pgtable.h> 17 17 #include <asm/ptrace.h>
+1 -1
arch/arm/mm/proc-arm946.S
··· 13 13 #include <linux/linkage.h> 14 14 #include <linux/init.h> 15 15 #include <asm/assembler.h> 16 - #include <asm/elf.h> 16 + #include <asm/hwcap.h> 17 17 #include <asm/pgtable-hwdef.h> 18 18 #include <asm/pgtable.h> 19 19 #include <asm/ptrace.h>
+1 -1
arch/arm/mm/proc-arm9tdmi.S
··· 12 12 #include <linux/init.h> 13 13 #include <asm/assembler.h> 14 14 #include <asm/asm-offsets.h> 15 - #include <asm/elf.h> 15 + #include <asm/hwcap.h> 16 16 #include <asm/pgtable-hwdef.h> 17 17 #include <asm/pgtable.h> 18 18 #include <asm/ptrace.h>
+1 -1
arch/arm/mm/proc-feroceon.S
··· 22 22 #include <linux/linkage.h> 23 23 #include <linux/init.h> 24 24 #include <asm/assembler.h> 25 - #include <asm/elf.h> 25 + #include <asm/hwcap.h> 26 26 #include <asm/pgtable-hwdef.h> 27 27 #include <asm/pgtable.h> 28 28 #include <asm/page.h>
+1 -1
arch/arm/mm/proc-sa110.S
··· 17 17 #include <linux/init.h> 18 18 #include <asm/assembler.h> 19 19 #include <asm/asm-offsets.h> 20 - #include <asm/elf.h> 20 + #include <asm/hwcap.h> 21 21 #include <mach/hardware.h> 22 22 #include <asm/pgtable-hwdef.h> 23 23 #include <asm/pgtable.h>
+1 -1
arch/arm/mm/proc-sa1100.S
··· 22 22 #include <linux/init.h> 23 23 #include <asm/assembler.h> 24 24 #include <asm/asm-offsets.h> 25 - #include <asm/elf.h> 25 + #include <asm/hwcap.h> 26 26 #include <mach/hardware.h> 27 27 #include <asm/pgtable-hwdef.h> 28 28 #include <asm/pgtable.h>
+1 -1
arch/arm/mm/proc-v6.S
··· 13 13 #include <linux/linkage.h> 14 14 #include <asm/assembler.h> 15 15 #include <asm/asm-offsets.h> 16 - #include <asm/elf.h> 16 + #include <asm/hwcap.h> 17 17 #include <asm/pgtable-hwdef.h> 18 18 #include <asm/pgtable.h> 19 19
+1 -1
arch/arm/mm/proc-v7.S
··· 12 12 #include <linux/linkage.h> 13 13 #include <asm/assembler.h> 14 14 #include <asm/asm-offsets.h> 15 - #include <asm/elf.h> 15 + #include <asm/hwcap.h> 16 16 #include <asm/pgtable-hwdef.h> 17 17 #include <asm/pgtable.h> 18 18
+1 -1
arch/arm/mm/proc-xsc3.S
··· 27 27 #include <linux/linkage.h> 28 28 #include <linux/init.h> 29 29 #include <asm/assembler.h> 30 - #include <asm/elf.h> 30 + #include <asm/hwcap.h> 31 31 #include <mach/hardware.h> 32 32 #include <asm/pgtable.h> 33 33 #include <asm/pgtable-hwdef.h>
+1 -1
arch/arm/mm/proc-xscale.S
··· 23 23 #include <linux/linkage.h> 24 24 #include <linux/init.h> 25 25 #include <asm/assembler.h> 26 - #include <asm/elf.h> 26 + #include <asm/hwcap.h> 27 27 #include <asm/pgtable.h> 28 28 #include <asm/pgtable-hwdef.h> 29 29 #include <asm/page.h>