summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2012-08-03 17:24:14 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-08-11 09:15:57 +0100
commit3d9fb0038a9b02febb01efc79a4a5d97f1822a90 (patch)
treeed969703896852d5f83a76e0fb05edb0eabe7692 /arch
parentf7e416eb923d0f9ff1e5e9b5c0e8b75ddd7db865 (diff)
downloadlinux-3d9fb0038a9b02febb01efc79a4a5d97f1822a90.tar.gz
linux-3d9fb0038a9b02febb01efc79a4a5d97f1822a90.tar.bz2
linux-3d9fb0038a9b02febb01efc79a4a5d97f1822a90.zip
ARM: 7483/1: vfp: only advertise VFPv4 in hwcaps if CONFIG_VFPv3 is enabled
VFPv4 support depends on the VFPv3 context save/restore code, so only advertise support in the hwcaps if the kernel can actually handle it. Cc: <stable@vger.kernel.org> # 3.1+ Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/vfp/vfpmodule.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index fb849d044bde..c834b32af275 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -719,8 +719,10 @@ static int __init vfp_init(void)
if ((fmrx(MVFR1) & 0x000fff00) == 0x00011100)
elf_hwcap |= HWCAP_NEON;
#endif
+#ifdef CONFIG_VFPv3
if ((fmrx(MVFR1) & 0xf0000000) == 0x10000000)
elf_hwcap |= HWCAP_VFPv4;
+#endif
}
}
return 0;