locking/qspinlock: Merge 'struct __qspinlock' into 'struct qspinlock'
authorWill Deacon <will.deacon@arm.com>
Thu, 26 Apr 2018 10:34:16 +0000 (11:34 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 27 Apr 2018 07:48:45 +0000 (09:48 +0200)
commit625e88be1f41b53cec55827c984e4a89ea8ee9f9
treef048dd06ff74ea19fc94f8a9aa844d41b5fb8a74
parentfcfdfe30e324725007e9dc5814b62a4c430ea909
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>
arch/x86/include/asm/qspinlock.h
arch/x86/include/asm/qspinlock_paravirt.h
include/asm-generic/qspinlock_types.h
kernel/locking/qspinlock.c
kernel/locking/qspinlock_paravirt.h