Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4397d9e authored by Vladimir Murzin's avatar Vladimir Murzin Committed by Gerrit - the friendly Code Review server
Browse files

ARM: fix demoting HWCAP_SWP 



Commit b8c9592 "ARM: 8318/1: treat CPU feature register fields as signed
quantities" accidentally altered cpuid register used to demote
HWCAP_SWP.
ARM ARM says that SyncPrim_instrs bits in ID_ISAR3 should be used with
SynchPrim_instrs_frac from ID_ISAR4. So, follow this rule.

Change-Id: Id921093060b4ead12d5d3cf306c61428b284a4dd
Signed-off-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
Acked-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Patch-mainline: linux-arm-kernel @ 01/26/16, 10:23
Signed-off-by: default avatarNeeraj Upadhyay <neeraju@codeaurora.org>
parent 3a899356

arch/arm/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,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;

}