diff options
| author | Jens Axboe <axboe@fb.com> | 2015-01-02 23:03:42 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-01-02 23:03:42 +0100 |
| commit | 5d7bf4d8f664468223846abcfc683f4694014074 (patch) | |
| tree | 942496e8b6b6753502bcdbc513f0547c80af3d30 /arch/x86/include/asm/spinlock.h | |
| parent | block: fix checking return value of blk_mq_init_queue (diff) | |
| parent | Linux 3.19-rc2 (diff) | |
| download | linux-5d7bf4d8f664468223846abcfc683f4694014074.tar.xz linux-5d7bf4d8f664468223846abcfc683f4694014074.zip | |
Merge tag 'v3.19-rc2' into for-3.20/core
Linux 3.19-rc2
Diffstat (limited to 'arch/x86/include/asm/spinlock.h')
| -rw-r--r-- | arch/x86/include/asm/spinlock.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h index a4efe477ceab..625660f8a2fc 100644 --- a/arch/x86/include/asm/spinlock.h +++ b/arch/x86/include/asm/spinlock.h @@ -92,7 +92,7 @@ static __always_inline void arch_spin_lock(arch_spinlock_t *lock) unsigned count = SPIN_THRESHOLD; do { - if (ACCESS_ONCE(lock->tickets.head) == inc.tail) + if (READ_ONCE(lock->tickets.head) == inc.tail) goto out; cpu_relax(); } while (--count); @@ -105,7 +105,7 @@ static __always_inline int arch_spin_trylock(arch_spinlock_t *lock) { arch_spinlock_t old, new; - old.tickets = ACCESS_ONCE(lock->tickets); + old.tickets = READ_ONCE(lock->tickets); if (old.tickets.head != (old.tickets.tail & ~TICKET_SLOWPATH_FLAG)) return 0; @@ -162,14 +162,14 @@ static __always_inline void arch_spin_unlock(arch_spinlock_t *lock) static inline int arch_spin_is_locked(arch_spinlock_t *lock) { - struct __raw_tickets tmp = ACCESS_ONCE(lock->tickets); + struct __raw_tickets tmp = READ_ONCE(lock->tickets); return tmp.tail != tmp.head; } static inline int arch_spin_is_contended(arch_spinlock_t *lock) { - struct __raw_tickets tmp = ACCESS_ONCE(lock->tickets); + struct __raw_tickets tmp = READ_ONCE(lock->tickets); return (__ticket_t)(tmp.tail - tmp.head) > TICKET_LOCK_INC; } |