Commit efbc9578 authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Will Deacon
Browse files

arm64: jump_label: mark arguments as const to satisfy asm constraints 

Inspired by x86 commit 864b4355("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: default avatarJisheng Zhang <jszhang@kernel.org>
Link: https://lore.kernel.org/r/20221006075542.2658-2-jszhang@kernel.org


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent f0c4d9fc

arch/arm64/include/asm/jump_label.h

+4 −4
Original line number Diff line number Diff line
@@ -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 @@ static __always_inline bool arch_static_branch(struct static_key *key, 
	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"