From 7c3654bda56adf05c10377e7f8a4512fab3aa1d5 Mon Sep 17 00:00:00 2001
From: Chris Metcalf <cmetcalf@tilera.com>
Date: Tue, 27 Mar 2012 14:17:05 -0400
Subject: [PATCH] --- yaml --- r: 298831 b: refs/heads/master c:
 664c100bce0070148131f8d49518015476c03cae h: refs/heads/master i:   298829:
 c7ec9177f5459133132308efeaaa98864d086766   298827:
 d6f75f8f7c5659dfb73fe7290d222b13b2b3d7fe   298823:
 cc883209a0a6816930f3526ae572e5f6cd094687   298815:
 37f290704e471c438f67c4c133b2a58594ace3ff v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/tile/include/asm/bitops_64.h | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f50ad7b0a6ef..be7ff98b94cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07feea877d18453bbe4ad47fe2a365eebf56a7af
+refs/heads/master: 664c100bce0070148131f8d49518015476c03cae
diff --git a/trunk/arch/tile/include/asm/bitops_64.h b/trunk/arch/tile/include/asm/bitops_64.h
index 58d021a9834f..60b87ee54fb8 100644
--- a/trunk/arch/tile/include/asm/bitops_64.h
+++ b/trunk/arch/tile/include/asm/bitops_64.h
@@ -38,10 +38,10 @@ static inline void clear_bit(unsigned nr, volatile unsigned long *addr)
 
 static inline void change_bit(unsigned nr, volatile unsigned long *addr)
 {
-	unsigned long old, mask = (1UL << (nr % BITS_PER_LONG));
-	long guess, oldval;
+	unsigned long mask = (1UL << (nr % BITS_PER_LONG));
+	unsigned long guess, oldval;
 	addr += nr / BITS_PER_LONG;
-	old = *addr;
+	oldval = *addr;
 	do {
 		guess = oldval;
 		oldval = atomic64_cmpxchg((atomic64_t *)addr,
@@ -85,7 +85,7 @@ static inline int test_and_change_bit(unsigned nr,
 				      volatile unsigned long *addr)
 {
 	unsigned long mask = (1UL << (nr % BITS_PER_LONG));
-	long guess, oldval = *addr;
+	unsigned long guess, oldval;
 	addr += nr / BITS_PER_LONG;
 	oldval = *addr;
 	do {