summaryrefslogtreecommitdiffstats
path: root/arch/xtensa/include/asm/jump_label.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-02-19 09:06:37 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-02-19 09:06:37 +0100
commit36d97cdaf46593330067c34ed3639d0556d4fd6d (patch)
tree8f15f5dc52d5c0a045751b8dd20768bd8a11605f /arch/xtensa/include/asm/jump_label.h
parent548fcf037b3f8592e9fe41469110453a777416d6 (diff)
parentb401b621758e46812da61fa58a67c3fd8d91de0d (diff)
downloadlinux-stable-36d97cdaf46593330067c34ed3639d0556d4fd6d.tar.gz
linux-stable-36d97cdaf46593330067c34ed3639d0556d4fd6d.tar.bz2
linux-stable-36d97cdaf46593330067c34ed3639d0556d4fd6d.zip
Merge 6.8-rc5 into tty-next
We need the serial/tty fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/xtensa/include/asm/jump_label.h')
-rw-r--r--arch/xtensa/include/asm/jump_label.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/xtensa/include/asm/jump_label.h b/arch/xtensa/include/asm/jump_label.h
index c812bf85021c..46c8596259d2 100644
--- a/arch/xtensa/include/asm/jump_label.h
+++ b/arch/xtensa/include/asm/jump_label.h
@@ -13,7 +13,7 @@
static __always_inline bool arch_static_branch(struct static_key *key,
bool branch)
{
- asm_volatile_goto("1:\n\t"
+ asm goto("1:\n\t"
"_nop\n\t"
".pushsection __jump_table, \"aw\"\n\t"
".word 1b, %l[l_yes], %c0\n\t"
@@ -38,7 +38,7 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key,
* make it reachable and wrap both into a no-transform block
* to avoid any assembler interference with this.
*/
- asm_volatile_goto("1:\n\t"
+ asm goto("1:\n\t"
".begin no-transform\n\t"
"_j %l[l_yes]\n\t"
"2:\n\t"