evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

arm64: lse: rename ARM64_CPU_FEAT_LSE_ATOMICS for consistency

Browse source 
Other CPU features follow an 'ARM64_HAS_*' naming scheme, so do the same
for the LSE atomics.

Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
Will Deacon 2015-07-27 14:11:55 +01:00
parent 95eff6b27c
commit c739dc83a0
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm64/include/asm/cpufeature.h
View file

@ -26,7 +26,7 @@
#define ARM64_WORKAROUND_845719 2 #define ARM64_WORKAROUND_845719 2
#define ARM64_HAS_SYSREG_GIC_CPUIF 3 #define ARM64_HAS_SYSREG_GIC_CPUIF 3
#define ARM64_HAS_PAN 4 #define ARM64_HAS_PAN 4
#define ARM64_CPU_FEAT_LSE_ATOMICS 5 #define ARM64_HAS_LSE_ATOMICS 5
#define ARM64_NCAPS 6 #define ARM64_NCAPS 6

4
arch/arm64/include/asm/lse.h
View file

@ -12,7 +12,7 @@
.arch_extension lse .arch_extension lse
.macro alt_lse, llsc, lse .macro alt_lse, llsc, lse
alternative_insn "\llsc", "\lse", ARM64_CPU_FEAT_LSE_ATOMICS alternative_insn "\llsc", "\lse", ARM64_HAS_LSE_ATOMICS
.endm .endm
#else /* __ASSEMBLER__ */ #else /* __ASSEMBLER__ */
@ -29,7 +29,7 @@ __asm__(".arch_extension lse");
/* In-line patching at runtime */ /* In-line patching at runtime */
#define ARM64_LSE_ATOMIC_INSN(llsc, lse) \ #define ARM64_LSE_ATOMIC_INSN(llsc, lse) \
ALTERNATIVE(llsc, lse, ARM64_CPU_FEAT_LSE_ATOMICS) ALTERNATIVE(llsc, lse, ARM64_HAS_LSE_ATOMICS)
#endif /* __ASSEMBLER__ */ #endif /* __ASSEMBLER__ */
#else /* CONFIG_AS_LSE && CONFIG_ARM64_LSE_ATOMICS */ #else /* CONFIG_AS_LSE && CONFIG_ARM64_LSE_ATOMICS */

2
arch/arm64/kernel/setup.c
View file

@ -284,7 +284,7 @@ static void __init setup_processor(void)
default: default:
case 2: case 2:
elf_hwcap |= HWCAP_ATOMICS; elf_hwcap |= HWCAP_ATOMICS;
cpus_set_cap(ARM64_CPU_FEAT_LSE_ATOMICS); cpus_set_cap(ARM64_HAS_LSE_ATOMICS);
if (IS_ENABLED(CONFIG_AS_LSE) && if (IS_ENABLED(CONFIG_AS_LSE) &&
IS_ENABLED(CONFIG_ARM64_LSE_ATOMICS)) IS_ENABLED(CONFIG_ARM64_LSE_ATOMICS))
pr_info("LSE atomics supported\n"); pr_info("LSE atomics supported\n");