From: Akira Takeuchi <takeuchi.akr@jp.panasonic.com>
Date: Wed, 27 Oct 2010 16:28:36 +0000 (+0100)
Subject: MN10300: Don't cast away the volatile in test_bit()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3195d0b564c4aa3f8ff13b536e3c09a9ffed8f12;p=deliverable%2Flinux.git

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>
---

diff --git a/arch/mn10300/include/asm/bitops.h b/arch/mn10300/include/asm/bitops.h
index 6208ea60458e..3b8a868188f5 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));
 }
 
 /*