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

[ARM] 4473/2: Take the HWCAP definitions out of the elf.h file

The patch moves the HWCAP definitions and the extern elf_hwcap
declaration to the hwcap.h header file.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Catalin Marinas and committed by
Russell King
f884b1cf 909d6c6c

+31 -22
+2
include/asm-arm/Kbuild
··· 1 1 include include/asm-generic/Kbuild.asm 2 + 3 + unifdef-y += hwcap.h
+1 -22
include/asm-arm/elf.h
··· 7 7 */ 8 8 #include <asm/ptrace.h> 9 9 #include <asm/user.h> 10 + #include <asm/hwcap.h> 10 11 11 12 typedef unsigned long elf_greg_t; 12 13 typedef unsigned long elf_freg_t[3]; ··· 40 39 #endif 41 40 #define ELF_ARCH EM_ARM 42 41 43 - /* 44 - * HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP 45 - */ 46 - #define HWCAP_SWP 1 47 - #define HWCAP_HALF 2 48 - #define HWCAP_THUMB 4 49 - #define HWCAP_26BIT 8 /* Play it safe */ 50 - #define HWCAP_FAST_MULT 16 51 - #define HWCAP_FPA 32 52 - #define HWCAP_VFP 64 53 - #define HWCAP_EDSP 128 54 - #define HWCAP_JAVA 256 55 - #define HWCAP_IWMMXT 512 56 - #define HWCAP_CRUNCH 1024 57 - 58 42 #ifdef __KERNEL__ 59 43 #ifndef __ASSEMBLY__ 60 - /* 61 - * This yields a mask that user programs can use to figure out what 62 - * instruction set this cpu supports. 63 - */ 64 - #define ELF_HWCAP (elf_hwcap) 65 - extern unsigned int elf_hwcap; 66 - 67 44 /* 68 45 * This yields a string that ld.so will use to load implementation 69 46 * specific libraries for optimization. This is more specific in
+28
include/asm-arm/hwcap.h
··· 1 + #ifndef __ASMARM_HWCAP_H 2 + #define __ASMARM_HWCAP_H 3 + 4 + /* 5 + * HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP 6 + */ 7 + #define HWCAP_SWP 1 8 + #define HWCAP_HALF 2 9 + #define HWCAP_THUMB 4 10 + #define HWCAP_26BIT 8 /* Play it safe */ 11 + #define HWCAP_FAST_MULT 16 12 + #define HWCAP_FPA 32 13 + #define HWCAP_VFP 64 14 + #define HWCAP_EDSP 128 15 + #define HWCAP_JAVA 256 16 + #define HWCAP_IWMMXT 512 17 + #define HWCAP_CRUNCH 1024 18 + 19 + #if defined(__KERNEL__) && !defined(__ASSEMBLY__) 20 + /* 21 + * This yields a mask that user programs can use to figure out what 22 + * instruction set this cpu supports. 23 + */ 24 + #define ELF_HWCAP (elf_hwcap) 25 + extern unsigned int elf_hwcap; 26 + #endif 27 + 28 + #endif