diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
| commit | 0612ec48762bf8712db1925b2e67246d2237ebab (patch) | |
| tree | 01b0d69c9c9915015c0f23ad4263646dd5413e99 /include/asm-sh/system.h | |
| parent | 4263cf0fac28122c8381b6f4f9441a43cd93c81f (diff) | |
| parent | 47a5c6fa0e204a2b63309c648bb2fde36836c826 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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) |