M68k bitops
PATCH 1/1 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 <[email protected]>
include/asm-m68k/bitops.h +4 -4
@@ -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" );
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds