---

yaml --- r: 292702 b: refs/heads/master c: 7931d49 h: refs/heads/master v: v3
git-mirror · Feb 7, 2012 · c028a59 · c028a59
1 parent 7329159
commit c028a59
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d8e22777e66f420e46490e9fc6f8cb7e0e2222b
+refs/heads/master: 7931d493051ea9b09e4fddee2dc40b2eb88d62b9
diff --git a/trunk/arch/x86/include/asm/spinlock.h b/trunk/arch/x86/include/asm/spinlock.h
@@ -88,14 +88,14 @@ static inline int __ticket_spin_is_locked(arch_spinlock_t *lock)
 {
 	struct __raw_tickets tmp = ACCESS_ONCE(lock->tickets);
 
-	return !!(tmp.tail ^ tmp.head);
+	return tmp.tail != tmp.head;
 }
 
 static inline int __ticket_spin_is_contended(arch_spinlock_t *lock)
 {
 	struct __raw_tickets tmp = ACCESS_ONCE(lock->tickets);
 
-	return ((tmp.tail - tmp.head) & TICKET_MASK) > 1;
+	return (__ticket_t)(tmp.tail - tmp.head) > 1;
 }
 
 #ifndef CONFIG_PARAVIRT_SPINLOCKS

diff --git a/trunk/arch/x86/include/asm/spinlock_types.h b/trunk/arch/x86/include/asm/spinlock_types.h
@@ -16,7 +16,6 @@ typedef u32 __ticketpair_t;
 #endif
 
 #define TICKET_SHIFT	(sizeof(__ticket_t) * 8)
-#define TICKET_MASK	((__ticket_t)((1 << TICKET_SHIFT) - 1))
 
 typedef struct arch_spinlock {
 	union {
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,6 @@ typedef u32 __ticketpair_t; @@
     #endif
     #define TICKET_SHIFT	(sizeof(__ticket_t) * 8)
-    #define TICKET_MASK	((__ticket_t)((1 << TICKET_SHIFT) - 1))
     typedef struct arch_spinlock {
     	union {
@@ Expand Down @@