diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-30 11:37:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-30 11:37:16 -0700 |
| commit | fb20c03d3748fc6991dd58a3161c0d954485c2ce (patch) | |
| tree | 751c3d121f489111b54aa32793570516bd2f36db /arch/x86 | |
| parent | d464b0314c79996a0a4ae9ed3b13f914052d747d (diff) | |
| parent | c0dc373a780f4ec63e45a573b9551763abd8cd1a (diff) | |
| download | linux-fb20c03d3748fc6991dd58a3161c0d954485c2ce.tar.bz2 | |
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixes from Ingo Molnar:
"A paravirt UP-patching fix, and an I2C MUX driver lockdep warning fix"
* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
locking/pvqspinlock/x86: Use LOCK_PREFIX in __pv_queued_spin_unlock() assembly code
i2c/mux, locking/core: Annotate the nested rt_mutex usage
locking/rtmutex: Allow specifying a subclass for nested locking
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/qspinlock_paravirt.h | 2 |
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 9ef5ee03d2d7..159622ee0674 100644 --- a/arch/x86/include/asm/qspinlock_paravirt.h +++ b/arch/x86/include/asm/qspinlock_paravirt.h @@ -43,7 +43,7 @@ asm (".pushsection .text;" "push %rdx;" "mov $0x1,%eax;" "xor %edx,%edx;" - "lock cmpxchg %dl,(%rdi);" + LOCK_PREFIX "cmpxchg %dl,(%rdi);" "cmp $0x1,%al;" "jne .slowpath;" "pop %rdx;" |