From 2d81b33d98fda09b82f45561279ada63a5f218f1 Mon Sep 17 00:00:00 2001
From: Johannes Weiner <[hannes@cmpxchg.org]>
Date: Tue, 11 Aug 2009 14:52:10 -0700
Subject: [PATCH] --- yaml --- r: 156647 b: refs/heads/master c:
 8d6f9af91959256244878cd801c1c969e66cd093 h: refs/heads/master i:   156645:
 63e31d7313e5e4ceac5a0b9fecada9a632264bde   156643:
 5e966044245477c61f99ad62b79732812d6f5155   156639:
 e9c1439442e8c15766a5ae034d119ff7819a1571 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/ia64/include/asm/bitops.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fc283fe199d8..df7ce0691de5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51b89f7a6615eca184aa0b85db5781d931e9c8d1
+refs/heads/master: 8d6f9af91959256244878cd801c1c969e66cd093
diff --git a/trunk/arch/ia64/include/asm/bitops.h b/trunk/arch/ia64/include/asm/bitops.h
index e2ca80037335..57a2787bc9fb 100644
--- a/trunk/arch/ia64/include/asm/bitops.h
+++ b/trunk/arch/ia64/include/asm/bitops.h
@@ -286,7 +286,7 @@ __test_and_clear_bit(int nr, volatile void * addr)
 {
 	__u32 *p = (__u32 *) addr + (nr >> 5);
 	__u32 m = 1 << (nr & 31);
-	int oldbitset = *p & m;
+	int oldbitset = (*p & m) != 0;
 
 	*p &= ~m;
 	return oldbitset;