diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-10-20 00:26:44 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-10-20 00:26:44 -0400 |
| commit | 748c5151deb56e4b7b5a9b07a884243764933831 (patch) | |
| tree | e9dd45b8806d00b56503cfa55c46f3ebce0d151c /include/asm-sh64/system.h | |
| parent | 4879b44829d94a1f8facf90cced3c5f23c5a8c62 (diff) | |
| parent | e8b8c977734193adedf2b0f607d6252c78e86394 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-sh64/system.h')
| -rw-r--r-- | include/asm-sh64/system.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-sh64/system.h b/include/asm-sh64/system.h index 5ff94644e8c8..be2a15ffcc55 100644 --- a/include/asm-sh64/system.h +++ b/include/asm-sh64/system.h | |||
| @@ -62,8 +62,7 @@ extern void __xchg_called_with_bad_pointer(void); | |||
| 62 | #define smp_read_barrier_depends() do { } while (0) | 62 | #define smp_read_barrier_depends() do { } while (0) |
| 63 | #endif /* CONFIG_SMP */ | 63 | #endif /* CONFIG_SMP */ |
| 64 | 64 | ||
| 65 | #define set_rmb(var, value) do { (void)xchg(&var, value); } while (0) | 65 | #define set_mb(var, value) do { (void)xchg(&var, value); } while (0) |
| 66 | #define set_mb(var, value) set_rmb(var, value) | ||
| 67 | 66 | ||
| 68 | /* Interrupt Control */ | 67 | /* Interrupt Control */ |
| 69 | #ifndef HARD_CLI | 68 | #ifndef HARD_CLI |