Commit 6a211a75 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 712fb83d 23df39fc
...@@ -37,7 +37,7 @@ __PV_CALLEE_SAVE_REGS_THUNK(__pv_queued_spin_unlock_slowpath, ".spinlock.text"); ...@@ -37,7 +37,7 @@ __PV_CALLEE_SAVE_REGS_THUNK(__pv_queued_spin_unlock_slowpath, ".spinlock.text");
* rsi = lockval (second argument) * rsi = lockval (second argument)
* rdx = internal variable (set to 0) * rdx = internal variable (set to 0)
*/ */
asm (".pushsection .spinlock.text;" asm (".pushsection .spinlock.text, \"ax\";"
".globl " PV_UNLOCK ";" ".globl " PV_UNLOCK ";"
".type " PV_UNLOCK ", @function;" ".type " PV_UNLOCK ", @function;"
".align 4,0x90;" ".align 4,0x90;"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment