To: linus, akpm Cc: lkml Subject: [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 --- bitops.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- linux-2.6.8-rc2/include/asm-m68k/bitops.h 2004-06-21 20:20:00.000000000 +0200 +++ linux-m68k-2.6.8-rc2/include/asm-m68k/bitops.h 2004-07-12 12:00:36.000000000 +0200 @@ -52,14 +52,14 @@ #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 @@ __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");