summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Weiner <[hannes@cmpxchg.org]>2009-08-11 14:52:10 -0700
committerFenghua Yu <fenghua.yu@intel.com>2009-08-11 14:52:10 -0700
commit8d6f9af91959256244878cd801c1c969e66cd093 (patch)
treebd1dde34d4a3ef472d0a35d05b11320f762fd51f
parent51b89f7a6615eca184aa0b85db5781d931e9c8d1 (diff)
downloadconfigs-8d6f9af91959256244878cd801c1c969e66cd093.tar.gz
ia64: boolean __test_and_clear_bit
__test_and_clear_bit() returns a bitfield with the tested-for bit set. Make it consistent with the other bitops - of ia64 but also every other architecture - and return a boolean value. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Fenghua Yu <fenghua.yu@intel.com>
-rw-r--r--arch/ia64/include/asm/bitops.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/bitops.h b/arch/ia64/include/asm/bitops.h
index e2ca8003733..57a2787bc9f 100644
--- a/arch/ia64/include/asm/bitops.h
+++ b/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;