Skip to content

Commit 7f032fe

Browse files
heicarstVasily Gorbik
authored andcommitted
s390/jump_label: mark function(s) __always_inline
Always inline asm inlines with variable operands for "i" constraints, since they won't compile if the compiler would decide to not inline them. Reported-by: Michal Kubecek <[email protected]> Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Vasily Gorbik <[email protected]>
1 parent 44967bf commit 7f032fe

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/s390/include/asm/jump_label.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* We use a brcl 0,2 instruction for jump labels at compile time so it
2121
* can be easily distinguished from a hotpatch generated instruction.
2222
*/
23-
static inline bool arch_static_branch(struct static_key *key, bool branch)
23+
static __always_inline bool arch_static_branch(struct static_key *key, bool branch)
2424
{
2525
asm_volatile_goto("0: brcl 0,"__stringify(JUMP_LABEL_NOP_OFFSET)"\n"
2626
".pushsection __jump_table,\"aw\"\n"
@@ -34,7 +34,7 @@ static inline bool arch_static_branch(struct static_key *key, bool branch)
3434
return true;
3535
}
3636

37-
static inline bool arch_static_branch_jump(struct static_key *key, bool branch)
37+
static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch)
3838
{
3939
asm_volatile_goto("0: brcl 15,%l[label]\n"
4040
".pushsection __jump_table,\"aw\"\n"

0 commit comments

Comments
 (0)