X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=include%2Fasm-sparc64%2Fbitops.h;h=6efc0162fb09b8e2fa6beb9de1eb5ebfc4ffdf15;hb=0a0fc0ddbe732779366ab6b1b879f62195e65967;hp=9c5e71970287fbaebb37297315be05dcce55bcb3;hpb=62778ba1aa2589dc78c36a32edc6f5a6ccaf50c6;p=powerpc.git diff --git a/include/asm-sparc64/bitops.h b/include/asm-sparc64/bitops.h index 9c5e719702..6efc0162fb 100644 --- a/include/asm-sparc64/bitops.h +++ b/include/asm-sparc64/bitops.h @@ -72,8 +72,8 @@ static inline int __test_and_change_bit(int nr, volatile unsigned long *addr) } #ifdef CONFIG_SMP -#define smp_mb__before_clear_bit() membar("#StoreLoad | #LoadLoad") -#define smp_mb__after_clear_bit() membar("#StoreLoad | #StoreStore") +#define smp_mb__before_clear_bit() membar_storeload_loadload() +#define smp_mb__after_clear_bit() membar_storeload_storestore() #else #define smp_mb__before_clear_bit() barrier() #define smp_mb__after_clear_bit() barrier() @@ -119,6 +119,7 @@ static inline unsigned long __ffs(unsigned long word) */ #define fls(x) generic_fls(x) +#define fls64(x) generic_fls64(x) #ifdef __KERNEL__