From c20cf45369ee2cfa0c0e35930c571f599e6e9dc8 Mon Sep 17 00:00:00 2001 From: Akira Takeuchi Date: Wed, 27 Oct 2010 17:28:36 +0100 Subject: [PATCH] --- yaml --- r: 218703 b: refs/heads/master c: 3195d0b564c4aa3f8ff13b536e3c09a9ffed8f12 h: refs/heads/master i: 218701: 8c0b49647f44f517c74c42ce6f5c29ab97f2b204 218699: 96284810c6c5a72819f9dc4c655f0e2b53f60301 218695: 4c8679db79e759730c9157e28fd83fbcf70eb618 218687: c37007cab33b549e55bc3eeb1e59066b2e6522a0 v: v3 --- [refs] | 2 +- trunk/arch/mn10300/include/asm/bitops.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3a5fe7fcf2ec..243cb18156eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a5f65df5a0fcbaa35e5417c0420d691fee4ac56 +refs/heads/master: 3195d0b564c4aa3f8ff13b536e3c09a9ffed8f12 diff --git a/trunk/arch/mn10300/include/asm/bitops.h b/trunk/arch/mn10300/include/asm/bitops.h index 6208ea60458e..3b8a868188f5 100644 --- a/trunk/arch/mn10300/include/asm/bitops.h +++ b/trunk/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)); } /*