diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
| commit | 20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch) | |
| tree | b4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /include/asm-sh/system.h | |
| parent | dd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff) | |
| parent | 64821324ca49f24be1a66f2f432108f96a24e596 (diff) | |
Merge branch 'from-linus' into upstream
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) |