aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/include/asm/alternative-macros.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm64/include/asm/alternative-macros.h b/arch/arm64/include/asm/alternative-macros.h
index 4a2a98d6d222..966767debaa3 100644
--- a/arch/arm64/include/asm/alternative-macros.h
+++ b/arch/arm64/include/asm/alternative-macros.h
@@ -215,13 +215,13 @@ alternative_endif
#ifndef __ASSEMBLY__
-#include <linux/bug.h>
#include <linux/types.h>
static __always_inline bool
alternative_has_feature_likely(unsigned long feature)
{
- BUILD_BUG_ON(feature >= ARM64_NCAPS);
+ compiletime_assert(feature < ARM64_NCAPS,
+ "feature must be < ARM64_NCAPS");
asm_volatile_goto(
ALTERNATIVE_CB("b %l[l_no]", %[feature], alt_cb_patch_nops)
@@ -238,7 +238,8 @@ l_no:
static __always_inline bool
alternative_has_feature_unlikely(unsigned long feature)
{
- BUILD_BUG_ON(feature >= ARM64_NCAPS);
+ compiletime_assert(feature < ARM64_NCAPS,
+ "feature must be < ARM64_NCAPS");
asm_volatile_goto(
ALTERNATIVE("nop", "b %l[l_yes]", %[feature])