diff options
| author |   Will Deacon <will.deacon@arm.com> | 2018-04-26 11:34:16 +0100 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2018-04-27 09:48:45 +0200 |
| commit | 625e88be1f41b53cec55827c984e4a89ea8ee9f9 (patch) | |
| tree | f048dd06ff74ea19fc94f8a9aa844d41b5fb8a74 /arch/x86/include/asm/qspinlock.h | |
| parent | locking/barriers: Introduce smp_cond_load_relaxed() and atomic_cond_read_relaxed() (diff) | |
| download | wireguard-linux-625e88be1f41b53cec55827c984e4a89ea8ee9f9.tar.xz wireguard-linux-625e88be1f41b53cec55827c984e4a89ea8ee9f9.zip | |
locking/qspinlock: Merge 'struct __qspinlock' into 'struct qspinlock'
'struct __qspinlock' provides a handy union of fields so that
subcomponents of the lockword can be accessed by name, without having to
manage shifts and masks explicitly and take endianness into account.
This is useful in qspinlock.h and also potentially in arch headers, so
move the 'struct __qspinlock' into 'struct qspinlock' and kill the extra
definition.
Signed-off-by: Will Deacon <will.deacon@arm.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Waiman Long <longman@redhat.com>
Acked-by: Boqun Feng <boqun.feng@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: paulmck@linux.vnet.ibm.com
Link: http://lkml.kernel.org/r/1524738868-31318-3-git-send-email-will.deacon@arm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/qspinlock.h')
| -rw-r--r-- | arch/x86/include/asm/qspinlock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/qspinlock.h b/arch/x86/include/asm/qspinlock.h index 5e16b5d40d32..90b0b0ed8161 100644 --- a/arch/x86/include/asm/qspinlock.h +++ b/arch/x86/include/asm/qspinlock.h @@ -16,7 +16,7 @@ */ static inline void native_queued_spin_unlock(struct qspinlock *lock) { - smp_store_release((u8 *)lock, 0); + smp_store_release(&lock->locked, 0); } #ifdef CONFIG_PARAVIRT_SPINLOCKS |