diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-12-18 21:34:19 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-12-18 21:34:19 -0500 |
| commit | fe9c651a695053592cc82ce2543694a607745e54 (patch) | |
| tree | c301a60216d56921df7c59bf09c4379872dda162 /arch/arm/vfp/vfpmodule.c | |
| parent | a4c44d93716c35746116afecd41345071267e558 (diff) | |
| parent | 881c0a027c495dd35992346176a40d39a7666fb9 (diff) | |
Merge tag 'v3.0.57' into v3.0-rt
This is the 3.0.57 stable release
Diffstat (limited to 'arch/arm/vfp/vfpmodule.c')
| -rw-r--r-- | arch/arm/vfp/vfpmodule.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index f25e7ec89416..ce1880286961 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c @@ -575,11 +575,14 @@ static int __init vfp_init(void) elf_hwcap |= HWCAP_VFPv3; /* - * Check for VFPv3 D16. CPUs in this configuration - * only have 16 x 64bit registers. + * Check for VFPv3 D16 and VFPv4 D16. CPUs in + * this configuration only have 16 x 64bit + * registers. */ if (((fmrx(MVFR0) & MVFR0_A_SIMD_MASK)) == 1) - elf_hwcap |= HWCAP_VFPv3D16; + elf_hwcap |= HWCAP_VFPv3D16; /* also v4-D16 */ + else + elf_hwcap |= HWCAP_VFPD32; } #endif #ifdef CONFIG_NEON |