diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-11-09 14:37:06 +0000 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2006-11-30 12:24:46 +0000 |
| commit | 5974eaaedee49c25d7231cc72dc0b7b9d2ef2fd7 (patch) | |
| tree | 0dddc4481274a34dd798b49255b1d1355bcee27a /include/asm-arm/procinfo.h | |
| parent | [ARM] Include asm/elf.h instead of asm/procinfo.h (diff) | |
| download | linux-dev-5974eaaedee49c25d7231cc72dc0b7b9d2ef2fd7.tar.xz linux-dev-5974eaaedee49c25d7231cc72dc0b7b9d2ef2fd7.zip | |
[ARM] Move HWCAP_* definitions to asm/elf.h
Move HWCAP_* definitions into asm/elf.h, where they should belong.
Since userspace wants to get at these definitions by including
asm/procinfo.h, include asm/elf.h from this file if __KERNEL__
is not defined, and issue a warning suggesting to fix the program
up to use asm/elf.h instead.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/procinfo.h')
| -rw-r--r-- | include/asm-arm/procinfo.h | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/include/asm-arm/procinfo.h b/include/asm-arm/procinfo.h index 91a31adfa8a8..4d3c685075e0 100644 --- a/include/asm-arm/procinfo.h +++ b/include/asm-arm/procinfo.h @@ -10,7 +10,7 @@ #ifndef __ASM_PROCINFO_H #define __ASM_PROCINFO_H -#ifndef __ASSEMBLY__ +#ifdef __KERNEL__ struct cpu_tlb_fns; struct cpu_user_fns; @@ -42,19 +42,8 @@ struct proc_info_list { struct cpu_cache_fns *cache; }; -extern unsigned int elf_hwcap; - -#endif /* __ASSEMBLY__ */ - -#define HWCAP_SWP 1 -#define HWCAP_HALF 2 -#define HWCAP_THUMB 4 -#define HWCAP_26BIT 8 /* Play it safe */ -#define HWCAP_FAST_MULT 16 -#define HWCAP_FPA 32 -#define HWCAP_VFP 64 -#define HWCAP_EDSP 128 -#define HWCAP_JAVA 256 -#define HWCAP_IWMMXT 512 - +#else /* __KERNEL__ */ +#include <asm/elf.h> +#warning "Please include asm/elf.h instead" +#endif /* __KERNEL__ */ #endif |