summaryrefslogtreecommitdiff
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-05-05 08:12:37 (GMT)
committerIngo Molnar <mingo@kernel.org>2016-05-05 08:12:37 (GMT)
commit1a618c2cfe4c02190d8d1f9c5052f0defc58de20 (patch)
tree170002288786f702e1d4ca638b53d1594a7caa16 /arch/arm/kernel
parent03d85a63ee3e2d3a43460f936b86334b32f88c89 (diff)
parent8482716b9d865db34c55d4bf2fed19498e7195b9 (diff)
downloadlinux-1a618c2cfe4c02190d8d1f9c5052f0defc58de20.tar.xz
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index a28fce0..2c4bea3 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -512,7 +512,7 @@ static void __init elf_hwcap_fixup(void)
*/
if (cpuid_feature_extract(CPUID_EXT_ISAR3, 12) > 1 ||
(cpuid_feature_extract(CPUID_EXT_ISAR3, 12) == 1 &&
- cpuid_feature_extract(CPUID_EXT_ISAR3, 20) >= 3))
+ cpuid_feature_extract(CPUID_EXT_ISAR4, 20) >= 3))
elf_hwcap &= ~HWCAP_SWP;
}