[Xen-devel] [PATCH 20/20] x86/ticketlock: rename ticketpair to head_tail

[Jeremy Fitzhardinge <jeremy@xxxxxxxx>]

From: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>

Make it clearer what fields head_tail is actually overlapping with.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
---
 arch/x86/include/asm/spinlock.h       |    2 +-
 arch/x86/include/asm/spinlock_types.h |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
index a16b6e4..6850884 100644
--- a/arch/x86/include/asm/spinlock.h
+++ b/arch/x86/include/asm/spinlock.h
@@ -174,7 +174,7 @@ static __always_inline int 
arch_spin_trylock(arch_spinlock_t *lock)
 
        new.slock = tmp.slock + (1 << TICKET_SHIFT);
 
-       ret = cmpxchg(&lock->ticketpair, tmp.slock, new.slock) == tmp.slock;
+       ret = cmpxchg(&lock->head_tail, tmp.slock, new.slock) == tmp.slock;
        barrier();              /* just make nothing creeps before lock is 
claimed */
 
        return ret;
diff --git a/arch/x86/include/asm/spinlock_types.h 
b/arch/x86/include/asm/spinlock_types.h
index 307ef0b..df031ec 100644
--- a/arch/x86/include/asm/spinlock_types.h
+++ b/arch/x86/include/asm/spinlock_types.h
@@ -24,7 +24,7 @@ typedef struct arch_spinlock {
                struct {
                        __ticket_t waiting;
                        union {
-                               __ticketpair_t ticketpair;
+                               __ticketpair_t head_tail;
                                struct __raw_tickets {
                                        __ticket_t head, tail;
                                } tickets;
@@ -38,7 +38,7 @@ typedef struct arch_spinlock {
 #else
 typedef struct arch_spinlock {
        union {
-               __ticketpair_t ticketpair;
+               __ticketpair_t head_tail;
                struct __raw_tickets {
                        __ticket_t head, tail;
                } tickets;
-- 
1.7.2.3


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel