summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-11-20 19:39:45 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2022-11-20 19:39:45 +0100
commit6a211a753d1c836856cf942afbf3b6bfdcf0a5f4 (patch)
treefb8b951404ae845e39128b2e455f2727f12c3f0b
parentMerge tag 'powerpc-6.1-5' of git://git.kernel.org/pub/scm/linux/kernel/git/po... (diff)
parentlocking: Fix qspinlock/x86 inline asm error (diff)
downloadlinux-6a211a753d1c836856cf942afbf3b6bfdcf0a5f4.tar.xz
linux-6a211a753d1c836856cf942afbf3b6bfdcf0a5f4.zip
Merge tag 'locking_urgent_for_v6.1_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fix from Borislav Petkov: - Fix a build error with clang 11 * tag 'locking_urgent_for_v6.1_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: locking: Fix qspinlock/x86 inline asm error
-rw-r--r--arch/x86/include/asm/qspinlock_paravirt.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/qspinlock_paravirt.h b/arch/x86/include/asm/qspinlock_paravirt.h
index 60ece592b220..dbb38a6b4dfb 100644
--- a/arch/x86/include/asm/qspinlock_paravirt.h
+++ b/arch/x86/include/asm/qspinlock_paravirt.h
@@ -37,7 +37,7 @@ __PV_CALLEE_SAVE_REGS_THUNK(__pv_queued_spin_unlock_slowpath, ".spinlock.text");
* rsi = lockval (second argument)
* rdx = internal variable (set to 0)
*/
-asm (".pushsection .spinlock.text;"
+asm (".pushsection .spinlock.text, \"ax\";"
".globl " PV_UNLOCK ";"
".type " PV_UNLOCK ", @function;"
".align 4,0x90;"