From: Jan Beulich <jbeulich@suse.com>
Date: Thu, 28 May 2015 10:06:47 +0000 (+0200)
Subject: Revert "spinlock: fix build with older GCC"
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3159^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=02cdd81aa0a88007addc788c6cf93e2f1cb1a314;p=xen.git

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 29149d1537..c8dc8ba3dc 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 fb0438e542..bafbc74fc1 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;