---

yaml --- r: 218703 b: refs/heads/master c: 3195d0b h: refs/heads/master i: 218701: 8c0b496 218699: 9628481 218695: 4c8679d 218687: c37007c v: v3
git-mirror · Oct 27, 2010 · c20cf45 · c20cf45
1 parent 14076f9
commit c20cf45
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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));
 }
 
 /*
-Original file line number
+Diff line change
@@ Expand Up @@
      */
     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));
     }
     /*
@@ Expand Down @@