]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
s390/jump_label: mark function(s) __always_inline
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Fri, 4 Oct 2019 10:29:18 +0000 (12:29 +0200)
committerVasily Gorbik <gor@linux.ibm.com>
Fri, 4 Oct 2019 14:37:33 +0000 (16:37 +0200)
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 <mkubecek@suse.cz>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
arch/s390/include/asm/jump_label.h

index e548ec1ec12c5ea5e61cc4708388c55badbd3e39..39f747d63758e5333ef9d8d4885b5b84eaaa1510 100644 (file)
@@ -20,7 +20,7 @@
  * We use a brcl 0,2 instruction for jump labels at compile time so it
  * can be easily distinguished from a hotpatch generated instruction.
  */
-static inline bool arch_static_branch(struct static_key *key, bool branch)
+static __always_inline bool arch_static_branch(struct static_key *key, bool branch)
 {
        asm_volatile_goto("0:   brcl    0,"__stringify(JUMP_LABEL_NOP_OFFSET)"\n"
                          ".pushsection __jump_table,\"aw\"\n"
@@ -34,7 +34,7 @@ label:
        return true;
 }
 
-static inline bool arch_static_branch_jump(struct static_key *key, bool branch)
+static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch)
 {
        asm_volatile_goto("0:   brcl 15,%l[label]\n"
                          ".pushsection __jump_table,\"aw\"\n"