diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-18 09:04:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-18 09:04:17 -0700 |
| commit | e0ed1c22d480a3b5ec5fce4e5399cf4481da95a6 (patch) | |
| tree | f8750b76d55bcfe6c0d81678d2d87ccf92ad9e62 /arch/x86 | |
| parent | 50276c9abb9c236a359854f30eb8bb81fd14a22d (diff) | |
| parent | 5f43086bb9224987010460dcf3dee68fbd4f574d (diff) | |
| download | linux-e0ed1c22d480a3b5ec5fce4e5399cf4481da95a6.tar.gz linux-e0ed1c22d480a3b5ec5fce4e5399cf4481da95a6.tar.bz2 linux-e0ed1c22d480a3b5ec5fce4e5399cf4481da95a6.zip | |
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixes from Ingo Molnar:
"Two fixes:
- a file locks fix (missing critical section, bug introduced in this
merge window)
- an x86 down_write() stack frame annotation"
* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
locking, fs/locks: Add missing file_sem locks
locking/rwsem/x86: Add stack frame dependency for ____down_write()
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/rwsem.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h index 3d33a719f5c1..a34e0d4b957d 100644 --- a/arch/x86/include/asm/rwsem.h +++ b/arch/x86/include/asm/rwsem.h @@ -103,8 +103,10 @@ static inline bool __down_read_trylock(struct rw_semaphore *sem) ({ \ long tmp; \ struct rw_semaphore* ret; \ + register void *__sp asm(_ASM_SP); \ + \ asm volatile("# beginning down_write\n\t" \ - LOCK_PREFIX " xadd %1,(%3)\n\t" \ + LOCK_PREFIX " xadd %1,(%4)\n\t" \ /* adds 0xffff0001, returns the old value */ \ " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t" \ /* was the active mask 0 before? */\ @@ -112,7 +114,7 @@ static inline bool __down_read_trylock(struct rw_semaphore *sem) " call " slow_path "\n" \ "1:\n" \ "# ending down_write" \ - : "+m" (sem->count), "=d" (tmp), "=a" (ret) \ + : "+m" (sem->count), "=d" (tmp), "=a" (ret), "+r" (__sp) \ : "a" (sem), "1" (RWSEM_ACTIVE_WRITE_BIAS) \ : "memory", "cc"); \ ret; \ |