fixup! arm64: Implement Apple IMPDEF TSO memory model control

jannau · jannau · commit a955d757285a · 2024-03-11T10:49:54.000+01:00
diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h
@@ -905,7 +905,7 @@ static inline unsigned int get_vmid_bits(u64 mmfr1)
 static __always_inline bool system_has_actlr_state(void)
 {
 	return IS_ENABLED(CONFIG_ARM64_ACTLR_STATE) &&
-		cpus_have_const_cap(ARM64_HAS_TSO_APPLE);
+		alternative_has_cap_unlikely(ARM64_HAS_TSO_APPLE);
 }
 
 s64 arm64_ftr_safe_value(const struct arm64_ftr_bits *ftrp, s64 new, s64 cur);

Original file line number	Diff line number	Diff line change
`@@ -905,7 +905,7 @@ static inline unsigned int get_vmid_bits(u64 mmfr1)`
`905`	`905`	`static __always_inline bool system_has_actlr_state(void)`
`906`	`906`	`{`
`907`	`907`	`return IS_ENABLED(CONFIG_ARM64_ACTLR_STATE) &&`
`908`		`- cpus_have_const_cap(ARM64_HAS_TSO_APPLE);`
	`908`	`+ alternative_has_cap_unlikely(ARM64_HAS_TSO_APPLE);`
`909`	`909`	`}`
`910`	`910`
`911`	`911`	`s64 arm64_ftr_safe_value(const struct arm64_ftr_bits *ftrp, s64 new, s64 cur);`