---

yaml --- r: 298831 b: refs/heads/master c: 664c100 h: refs/heads/master i: 298829: c7ec917 298827: d6f75f8 298823: cc88320 298815: 37f2907 v: v3
git-mirror · Apr 2, 2012 · 7c3654b · 7c3654b
1 parent f423b77
commit 7c3654b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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 {