mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 15:18:19 +00:00
arm64: cpufeature: reorder cpus_have_{const, final}_cap()
In a subsequent patch we'll modify cpus_have_const_cap() to call cpus_have_final_cap(), and hence we need to define cpus_have_final_cap() first. To make subsequent changes easier to follow, this patch reorders the two without making any other changes. There should be no functional change as a result of this patch. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Marc Zyngier <maz@kernel.org> Acked-by: Will Deacon <will@kernel.org> Cc: David Brazdil <dbrazdil@google.com> Cc: Marc Zyngier <maz@kernel.org> Cc: Will Deacon <will@kernel.org> Link: https://lore.kernel.org/r/20201026134931.28246-3-mark.rutland@arm.com
This commit is contained in:
parent
e9a33caec9
commit
dfc4e3f089
1 changed files with 16 additions and 16 deletions
|
@ -427,22 +427,6 @@ static __always_inline bool __cpus_have_const_cap(int num)
|
||||||
return static_branch_unlikely(&cpu_hwcap_keys[num]);
|
return static_branch_unlikely(&cpu_hwcap_keys[num]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Test for a capability, possibly with a runtime check.
|
|
||||||
*
|
|
||||||
* Before capabilities are finalized, this behaves as cpus_have_cap().
|
|
||||||
* After capabilities are finalized, this is patched to avoid a runtime check.
|
|
||||||
*
|
|
||||||
* @num must be a compile-time constant.
|
|
||||||
*/
|
|
||||||
static __always_inline bool cpus_have_const_cap(int num)
|
|
||||||
{
|
|
||||||
if (system_capabilities_finalized())
|
|
||||||
return __cpus_have_const_cap(num);
|
|
||||||
else
|
|
||||||
return cpus_have_cap(num);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Test for a capability without a runtime check.
|
* Test for a capability without a runtime check.
|
||||||
*
|
*
|
||||||
|
@ -459,6 +443,22 @@ static __always_inline bool cpus_have_final_cap(int num)
|
||||||
BUG();
|
BUG();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Test for a capability, possibly with a runtime check.
|
||||||
|
*
|
||||||
|
* Before capabilities are finalized, this behaves as cpus_have_cap().
|
||||||
|
* After capabilities are finalized, this is patched to avoid a runtime check.
|
||||||
|
*
|
||||||
|
* @num must be a compile-time constant.
|
||||||
|
*/
|
||||||
|
static __always_inline bool cpus_have_const_cap(int num)
|
||||||
|
{
|
||||||
|
if (system_capabilities_finalized())
|
||||||
|
return __cpus_have_const_cap(num);
|
||||||
|
else
|
||||||
|
return cpus_have_cap(num);
|
||||||
|
}
|
||||||
|
|
||||||
static inline void cpus_set_cap(unsigned int num)
|
static inline void cpus_set_cap(unsigned int num)
|
||||||
{
|
{
|
||||||
if (num >= ARM64_NCAPS) {
|
if (num >= ARM64_NCAPS) {
|
||||||
|
|
Loading…
Reference in a new issue