Commit dfc4e3f0 authored by Mark Rutland's avatar Mark Rutland Committed by Marc Zyngier
Browse files

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: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Acked-by: default avatarWill 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
parent e9a33cae

arch/arm64/include/asm/cpufeature.h

+8 −8
Original line number Diff line number Diff line
@@ -428,35 +428,35 @@ static __always_inline bool __cpus_have_const_cap(int num) 
}



/*

 * Test for a capability, possibly with a runtime check.

 * Test for a capability without a runtime check.

 *

 * Before capabilities are finalized, this behaves as cpus_have_cap().

 * Before capabilities are finalized, this will BUG().

 * 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)

static __always_inline bool cpus_have_final_cap(int num)

{

	if (system_capabilities_finalized())

		return __cpus_have_const_cap(num);

	else

		return cpus_have_cap(num);

		BUG();

}



/*

 * Test for a capability without a runtime check.

 * Test for a capability, possibly with a runtime check.

 *

 * Before capabilities are finalized, this will BUG().

 * 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_final_cap(int num)

static __always_inline bool cpus_have_const_cap(int num)

{

	if (system_capabilities_finalized())

		return __cpus_have_const_cap(num);

	else

		BUG();

		return cpus_have_cap(num);

}



static inline void cpus_set_cap(unsigned int num)

CRA Git | Maintained and supported by SUSTech CRA and CCSE