diff options
| author | Will Deacon <will@kernel.org> | 2022-12-06 11:42:33 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-12-06 11:42:33 +0100 |
| commit | d49d7c2e04dc10cd364527ce2174e80875801526 (patch) | |
| tree | 72474155917ba546dbc19b2254eecbc58682a25a | |
| parent | Merge branch 'for-next/acpi' into for-next/core (diff) | |
| parent | arm64: alternative: constify alternative_has_feature_* argument (diff) | |
| download | linux-d49d7c2e04dc10cd364527ce2174e80875801526.tar.xz linux-d49d7c2e04dc10cd364527ce2174e80875801526.zip | |
Merge branch 'for-next/asm-const' into for-next/core
* for-next/asm-const:
arm64: alternative: constify alternative_has_feature_* argument
arm64: jump_label: mark arguments as const to satisfy asm constraints
| -rw-r--r-- | arch/arm64/include/asm/alternative-macros.h | 4 | ||||
| -rw-r--r-- | arch/arm64/include/asm/jump_label.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm64/include/asm/alternative-macros.h b/arch/arm64/include/asm/alternative-macros.h index 3622e9f4fb44..bdf1f6bcd010 100644 --- a/arch/arm64/include/asm/alternative-macros.h +++ b/arch/arm64/include/asm/alternative-macros.h @@ -224,7 +224,7 @@ alternative_endif #include <linux/types.h> static __always_inline bool -alternative_has_feature_likely(unsigned long feature) +alternative_has_feature_likely(const unsigned long feature) { compiletime_assert(feature < ARM64_NCAPS, "feature must be < ARM64_NCAPS"); @@ -242,7 +242,7 @@ l_no: } static __always_inline bool -alternative_has_feature_unlikely(unsigned long feature) +alternative_has_feature_unlikely(const unsigned long feature) { compiletime_assert(feature < ARM64_NCAPS, "feature must be < ARM64_NCAPS"); diff --git a/arch/arm64/include/asm/jump_label.h b/arch/arm64/include/asm/jump_label.h index cea441b6aa5d..48ddc0f45d22 100644 --- a/arch/arm64/include/asm/jump_label.h +++ b/arch/arm64/include/asm/jump_label.h @@ -15,8 +15,8 @@ #define JUMP_LABEL_NOP_SIZE AARCH64_INSN_SIZE -static __always_inline bool arch_static_branch(struct static_key *key, - bool branch) +static __always_inline bool arch_static_branch(struct static_key * const key, + const bool branch) { asm_volatile_goto( "1: nop \n\t" @@ -32,8 +32,8 @@ l_yes: return true; } -static __always_inline bool arch_static_branch_jump(struct static_key *key, - bool branch) +static __always_inline bool arch_static_branch_jump(struct static_key * const key, + const bool branch) { asm_volatile_goto( "1: b %l[l_yes] \n\t" |