aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/include/asm/bitops.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-08-13 11:48:01 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-08-13 11:48:01 +0900
commite290861f99131fc42d98012a9ea2dc185f08f8f9 (patch)
tree5c8b92d095d74d03b281711c81bac54bd59989cd /arch/ia64/include/asm/bitops.h
parentb4a757367d36cebddcd332a4024d92f1e87af370 (diff)
parentdbefd606a3b3634799b625f4900336e61c89e868 (diff)
downloadkernel_samsung_crespo-e290861f99131fc42d98012a9ea2dc185f08f8f9.zip
kernel_samsung_crespo-e290861f99131fc42d98012a9ea2dc185f08f8f9.tar.gz
kernel_samsung_crespo-e290861f99131fc42d98012a9ea2dc185f08f8f9.tar.bz2
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/ia64/include/asm/bitops.h')
-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 e2ca800..57a2787 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;