diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-30 13:32:29 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-30 13:32:29 -0400 |
| commit | ed735ccbefaf7e5e3ef61418f7e209b8c59308a7 (patch) | |
| tree | b8cc69814d2368b08d0a84c8da0c12028bd04867 /include/asm-sparc64/bitops.h | |
| parent | 39fbe47377062200acc26ea0ccef223b4399a82c (diff) | |
| parent | d8971fcb702e24d1e22c77fd1772f182ffee87e3 (diff) | |
Merge HEAD from /spare/repo/linux-2.6/.git
Diffstat (limited to 'include/asm-sparc64/bitops.h')
| -rw-r--r-- | include/asm-sparc64/bitops.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc64/bitops.h b/include/asm-sparc64/bitops.h index 9c5e71970287..6388b8376c50 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) | |||
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | #ifdef CONFIG_SMP | 74 | #ifdef CONFIG_SMP |
| 75 | #define smp_mb__before_clear_bit() membar("#StoreLoad | #LoadLoad") | 75 | #define smp_mb__before_clear_bit() membar_storeload_loadload() |
| 76 | #define smp_mb__after_clear_bit() membar("#StoreLoad | #StoreStore") | 76 | #define smp_mb__after_clear_bit() membar_storeload_storestore() |
| 77 | #else | 77 | #else |
| 78 | #define smp_mb__before_clear_bit() barrier() | 78 | #define smp_mb__before_clear_bit() barrier() |
| 79 | #define smp_mb__after_clear_bit() barrier() | 79 | #define smp_mb__after_clear_bit() barrier() |