diff options
| author |   Christian Borntraeger <borntraeger@de.ibm.com> | 2015-01-06 22:49:54 +0100 |
|---|---|---|
| committer | Christian Borntraeger <borntraeger@de.ibm.com> | 2015-01-19 14:14:20 +0100 |
| commit | bccec2a0a25206cb837e939adab94768a990ffa9 (patch) | |
| tree | ba25a4011b42868335dcb14da1def2abd9472808 | |
| parent | x86/xen/p2m: Replace ACCESS_ONCE with READ_ONCE (diff) | |
| download | linux-dev-bccec2a0a25206cb837e939adab94768a990ffa9.tar.xz linux-dev-bccec2a0a25206cb837e939adab94768a990ffa9.zip | |
x86/spinlock: Leftover conversion ACCESS_ONCE->READ_ONCE
commit 78bff1c8684f ("x86/ticketlock: Fix spin_unlock_wait() livelock")
introduced two additional ACCESS_ONCE cases in x86 spinlock.h.
Lets change those as well.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Oleg Nesterov <oleg@redhat.com>
| -rw-r--r-- | arch/x86/include/asm/spinlock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h index 625660f8a2fc..7050d864f520 100644 --- a/arch/x86/include/asm/spinlock.h +++ b/arch/x86/include/asm/spinlock.h @@ -183,10 +183,10 @@ static __always_inline void arch_spin_lock_flags(arch_spinlock_t *lock, static inline void arch_spin_unlock_wait(arch_spinlock_t *lock) { - __ticket_t head = ACCESS_ONCE(lock->tickets.head); + __ticket_t head = READ_ONCE(lock->tickets.head); for (;;) { - struct __raw_tickets tmp = ACCESS_ONCE(lock->tickets); + struct __raw_tickets tmp = READ_ONCE(lock->tickets); /* * We need to check "unlocked" in a loop, tmp.head == head * can be false positive because of overflow. |