aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAkira Takeuchi <takeuchi.akr@jp.panasonic.com>2010-10-27 17:28:36 +0100
committerDavid Howells <dhowells@redhat.com>2010-10-27 17:28:36 +0100
commit3195d0b564c4aa3f8ff13b536e3c09a9ffed8f12 (patch)
treec5e79b38462d87b690c563b063963e37a550281d
parent3a5f65df5a0fcbaa35e5417c0420d691fee4ac56 (diff)
downloadmrst-s0i3-test-3195d0b564c4aa3f8ff13b536e3c09a9ffed8f12.tar.gz
mrst-s0i3-test-3195d0b564c4aa3f8ff13b536e3c09a9ffed8f12.tar.xz
mrst-s0i3-test-3195d0b564c4aa3f8ff13b536e3c09a9ffed8f12.zip
MN10300: Don't cast away the volatile in test_bit()
Don't cast away the volatile in test_bit()'s parameter when we change its type from const volatile void * so that we can dereference it. Signed-off-by: Akira Takeuchi <takeuchi.akr@jp.panasonic.com> Signed-off-by: Kiyoshi Owada <owada.kiyoshi@jp.panasonic.com> Signed-off-by: David Howells <dhowells@redhat.com>
-rw-r--r--arch/mn10300/include/asm/bitops.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/include/asm/bitops.h b/arch/mn10300/include/asm/bitops.h
index 6208ea60458..3b8a868188f 100644
--- a/arch/mn10300/include/asm/bitops.h
+++ b/arch/mn10300/include/asm/bitops.h
@@ -72,7 +72,7 @@ static inline void __clear_bit(unsigned long nr, volatile void *addr)
*/
static inline int test_bit(unsigned long nr, const volatile void *addr)
{
- return 1UL & (((const unsigned int *) addr)[nr >> 5] >> (nr & 31));
+ return 1UL & (((const volatile unsigned int *) addr)[nr >> 5] >> (nr & 31));
}
/*