diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-04 22:50:27 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-04 22:50:27 -0400 |
| commit | d932cb7e630cae3b6b5307b767d296ff1a597c5e (patch) | |
| tree | f930d068a12a256fabef0864bcdf8e85f095369e /include/asm-m68k/system.h | |
| parent | 73b59a3b1c09e4bfc678400b77b96134dcfbf112 (diff) | |
| parent | f5d635f649607b09b0b4620d25d028fd2b1b7ea5 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'include/asm-m68k/system.h')
| -rw-r--r-- | include/asm-m68k/system.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-m68k/system.h b/include/asm-m68k/system.h index d6dd8052cd6f..131a0cb0f491 100644 --- a/include/asm-m68k/system.h +++ b/include/asm-m68k/system.h | |||
| @@ -80,7 +80,6 @@ static inline int irqs_disabled(void) | |||
| 80 | #define wmb() barrier() | 80 | #define wmb() barrier() |
| 81 | #define read_barrier_depends() do { } while(0) | 81 | #define read_barrier_depends() do { } while(0) |
| 82 | #define set_mb(var, value) do { xchg(&var, value); } while (0) | 82 | #define set_mb(var, value) do { xchg(&var, value); } while (0) |
| 83 | #define set_wmb(var, value) do { var = value; wmb(); } while (0) | ||
| 84 | 83 | ||
| 85 | #define smp_mb() barrier() | 84 | #define smp_mb() barrier() |
| 86 | #define smp_rmb() barrier() | 85 | #define smp_rmb() barrier() |