Skip to content

Commit 6a211a7

Browse files
committed
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
2 parents 712fb83 + 23df39f commit 6a211a7

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/include/asm/qspinlock_paravirt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ __PV_CALLEE_SAVE_REGS_THUNK(__pv_queued_spin_unlock_slowpath, ".spinlock.text");
3737
* rsi = lockval (second argument)
3838
* rdx = internal variable (set to 0)
3939
*/
40-
asm (".pushsection .spinlock.text;"
40+
asm (".pushsection .spinlock.text, \"ax\";"
4141
".globl " PV_UNLOCK ";"
4242
".type " PV_UNLOCK ", @function;"
4343
".align 4,0x90;"

0 commit comments

Comments
 (0)