aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/setup.c
diff options
context:
space:
mode:
authorTetsuyuki Kobayashi <koba@kmckk.co.jp>2013-07-22 09:58:17 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-07-22 10:53:41 -0400
commitab8d46c0609843a83aef3f486365ca5e7c21d537 (patch)
tree4b5782c0113112146741900481a96e21547a3444 /arch/arm/kernel/setup.c
parentb60d5db690f72a7cfe5e39f191f0719a9ef3a096 (diff)
ARM: 7788/1: elf: fix lpae hwcap feature reporting in proc/cpuinfo
Commit a469abd0f868 ("ARM: elf: add new hwcap for identifying atomic ldrd/strd instructions") added a new hwcap to identify LPAE on CPUs which support it. Whilst the hwcap data is correct, the string reported in /proc/cpuinfo actually matches on HWCAP_VFPD32, which was missing an entry in the string table. This patch fixes this problem by adding a "vfpd32" string at the correct offset, preventing us from falsely advertising LPAE on CPUs which do not support it. [will: added commit message] Acked-by: Will Deacon <will.deacon@arm.com> Tested-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/setup.c')
-rw-r--r--arch/arm/kernel/setup.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 63af9a7ae512..96286cb383bd 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -971,6 +971,7 @@ static const char *hwcap_str[] = {
971 "vfpv4", 971 "vfpv4",
972 "idiva", 972 "idiva",
973 "idivt", 973 "idivt",
974 "vfpd32",
974 "lpae", 975 "lpae",
975 NULL 976 NULL
976}; 977};