Revert "spinlock: fix build with older GCC"

This reverts commit 1037e33c88bb0e1fe530c164f242df17030102e1 as its
prereq commit 45fcc4568c is about to be reverted.

diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c
index 29149d15378f2b4b45deb3f5b8f28870323ce5c3..c8dc8ba3dc46142dec6bcf5551d50a86119fc82a 100644 (file)
--- 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 fb0438e5425cd822eb42f18b695dd5ee991f0ad2..bafbc74fc1bee77ee12bda93dda9823072aba6a1 100644 (file)
--- 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;