diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
| commit | 63fe46da9c380b3f2bbdf3765044649517cc717c (patch) | |
| tree | 9478c1aca1d692b408955aea20c9cd9a37e589c0 /include/asm-alpha/barrier.h | |
| parent | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (diff) | |
| parent | 066b2118976e6e7cc50eed39e2747c75343a23c4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
Diffstat (limited to 'include/asm-alpha/barrier.h')
| -rw-r--r-- | include/asm-alpha/barrier.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-alpha/barrier.h b/include/asm-alpha/barrier.h index 384dc08d6f53..ac78eba909bc 100644 --- a/include/asm-alpha/barrier.h +++ b/include/asm-alpha/barrier.h | |||
| @@ -24,7 +24,7 @@ __asm__ __volatile__("mb": : :"memory") | |||
| 24 | #define smp_mb() barrier() | 24 | #define smp_mb() barrier() |
| 25 | #define smp_rmb() barrier() | 25 | #define smp_rmb() barrier() |
| 26 | #define smp_wmb() barrier() | 26 | #define smp_wmb() barrier() |
| 27 | #define smp_read_barrier_depends() barrier() | 27 | #define smp_read_barrier_depends() do { } while (0) |
| 28 | #endif | 28 | #endif |
| 29 | 29 | ||
| 30 | #define set_mb(var, value) \ | 30 | #define set_mb(var, value) \ |