diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /include/asm-sh/system.h | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'include/asm-sh/system.h')
| -rw-r--r-- | include/asm-sh/system.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sh/system.h b/include/asm-sh/system.h index ce2e60664a86..ad35ad4958f4 100644 --- a/include/asm-sh/system.h +++ b/include/asm-sh/system.h | |||
| @@ -101,7 +101,6 @@ extern void __xchg_called_with_bad_pointer(void); | |||
| 101 | #endif | 101 | #endif |
| 102 | 102 | ||
| 103 | #define set_mb(var, value) do { xchg(&var, value); } while (0) | 103 | #define set_mb(var, value) do { xchg(&var, value); } while (0) |
| 104 | #define set_wmb(var, value) do { var = value; wmb(); } while (0) | ||
| 105 | 104 | ||
| 106 | /* Interrupt Control */ | 105 | /* Interrupt Control */ |
| 107 | static __inline__ void local_irq_enable(void) | 106 | static __inline__ void local_irq_enable(void) |