diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-15 12:43:13 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-15 12:43:13 +0100 |
| commit | 824df399a31fe92d88eb8caf86768cc8c7c72a06 (patch) | |
| tree | f966f72be04d1eb53e17b7866c6f49bf2b7d3b93 /arch/ia64/include/asm/bitops.h | |
| parent | 8b6120789598d55f6aa2b4e9ac7e70a205d857da (diff) | |
| parent | 48ec45e725aa385d72bced73b267dfaf13351876 (diff) | |
| download | blackbird-obmc-linux-824df399a31fe92d88eb8caf86768cc8c7c72a06.tar.gz blackbird-obmc-linux-824df399a31fe92d88eb8caf86768cc8c7c72a06.zip | |
Merge branch 's3c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'arch/ia64/include/asm/bitops.h')
| -rw-r--r-- | arch/ia64/include/asm/bitops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/bitops.h b/arch/ia64/include/asm/bitops.h index e2ca80037335..57a2787bc9fb 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; |
