git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
ia64
/
include
/
asm
/
bitops.h
diff --git
a/arch/ia64/include/asm/bitops.h
b/arch/ia64/include/asm/bitops.h
index
e2ca800
..
57a2787
100644
(file)
--- 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);
{
__u32 *p = (__u32 *) addr + (nr >> 5);
__u32 m = 1 << (nr & 31);
- int oldbitset =
*p & m
;
+ int oldbitset =
(*p & m) != 0
;
*p &= ~m;
return oldbitset;
*p &= ~m;
return oldbitset;