[PATCH] M68k bitops

M68k: Add `volatile' to some bitops parameters, as this is required by the
cpumask code in 2.6.8-rc1.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/include/asm-m68k/bitops.h b/include/asm-m68k/bitops.h
index 05ccc865d77bcac84c47decac17cd1b1a1ec7288..b1bcf7c66516f78bb4bbc553f0244f7b7535bb63 100644 (file)
--- a/include/asm-m68k/bitops.h
+++ b/include/asm-m68k/bitops.h
@@ -52,14 +52,14 @@ static inline int __generic_test_and_set_bit(int nr, unsigned long *vaddr)
 
 #define __set_bit(nr,vaddr) set_bit(nr,vaddr)
 
-static inline void __constant_set_bit(int nr, unsigned long *vaddr)
+static inline void __constant_set_bit(int nr, volatile unsigned long *vaddr)
 {
        char *p = (char *)vaddr + (nr ^ 31) / 8;
        __asm__ __volatile__ ("bset %1,%0"
                        : "+m" (*p) : "di" (nr & 7));
 }
 
-static inline void __generic_set_bit(int nr, unsigned long *vaddr)
+static inline void __generic_set_bit(int nr, volatile unsigned long *vaddr)
 {
        __asm__ __volatile__ ("bfset %1{%0:#1}"
                        : : "d" (nr^31), "o" (*vaddr) : "memory");
@@ -106,14 +106,14 @@ static inline int __generic_test_and_clear_bit(int nr, unsigned long *vaddr)
    __generic_clear_bit(nr, vaddr))
 #define __clear_bit(nr,vaddr) clear_bit(nr,vaddr)
 
-static inline void __constant_clear_bit(int nr, unsigned long *vaddr)
+static inline void __constant_clear_bit(int nr, volatile unsigned long *vaddr)
 {
        char *p = (char *)vaddr + (nr ^ 31) / 8;
        __asm__ __volatile__ ("bclr %1,%0"
                        : "+m" (*p) : "di" (nr & 7));
 }
 
-static inline void __generic_clear_bit(int nr, unsigned long *vaddr)
+static inline void __generic_clear_bit(int nr, volatile unsigned long *vaddr)
 {
        __asm__ __volatile__ ("bfclr %1{%0:#1}"
                        : : "d" (nr^31), "o" (*vaddr) : "memory");