[Xen-changelog] [xen master] Revert "spinlock: fix build with older GCC"

[patchbot@xxxxxxx]

commit 02cdd81aa0a88007addc788c6cf93e2f1cb1a314
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Thu May 28 12:06:47 2015 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu May 28 12:06:47 2015 +0200

    Revert "spinlock: fix build with older GCC"
    
    This reverts commit 1037e33c88bb0e1fe530c164f242df17030102e1 as its
    prereq commit 45fcc4568c is about to be reverted.
---
 xen/common/spinlock.c      |    2 +-
 xen/include/xen/spinlock.h |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c
index 29149d1..c8dc8ba 100644
--- a/xen/common/spinlock.c
+++ b/xen/common/spinlock.c
@@ -132,7 +132,7 @@ static always_inline u16 observe_head(spinlock_tickets_t *t)
 
 void _spin_lock(spinlock_t *lock)
 {
-    spinlock_tickets_t tickets = SPINLOCK_TICKET_INC;
+    spinlock_tickets_t tickets = { .tail = 1, };
     LOCK_PROFILE_VAR;
 
     check_lock(&lock->debug);
diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h
index fb0438e..bafbc74 100644
--- a/xen/include/xen/spinlock.h
+++ b/xen/include/xen/spinlock.h
@@ -133,8 +133,6 @@ typedef union {
     };
 } spinlock_tickets_t;
 
-#define SPINLOCK_TICKET_INC { .head_tail = 0x10000, }
-
 typedef struct spinlock {
     spinlock_tickets_t tickets;
     u16 recurse_cpu:12;
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog