arm64: jump_label: mark arguments as const to satisfy asm constraints
authorJisheng Zhang <jszhang@kernel.org>
Thu, 6 Oct 2022 07:55:41 +0000 (15:55 +0800)
committerWill Deacon <will@kernel.org>
Mon, 7 Nov 2022 15:59:14 +0000 (15:59 +0000)
Inspired by x86 commit 864b435514b2("x86/jump_label: Mark arguments as
const to satisfy asm constraints"), mark arch_static_branch()'s and
arch_static_branch_jump()'s arguments as const to satisfy asm
constraints. And Steven in [1] also pointed out that "The "i"
constraint needs to be a constant."

Tested with building a simple external kernel module with "O0".

[1]https://lore.kernel.org/all/20210212094059.5f8d05e8@gandalf.local.home/

Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Link: https://lore.kernel.org/r/20221006075542.2658-2-jszhang@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>
arch/arm64/include/asm/jump_label.h

index cea441b..48ddc0f 100644 (file)
@@ -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"