diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-12 20:31:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-12 20:31:36 -0400 |
commit | 7258ea8acd2252d5a68e7dfa2eac8dc8f364b91e (patch) | |
tree | a13594ddbd91b27c8afa49c1a2c6b4dc8141ae11 /include/asm-sh64/system.h | |
parent | af84b99f22df115e7aec41d5dbe936e163ef4e2e (diff) | |
parent | 1bb99a649af92e53ed7391afaf6c2d45a6f57b42 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
sh64: Add a sane pm_power_off implementation.
sh64: Use generic BUG_ON()/WARN_ON().
sh64: Trivial build fixes.
sh64: Drop deprecated ISA tuning for legacy toolchains.
Diffstat (limited to 'include/asm-sh64/system.h')
-rw-r--r-- | include/asm-sh64/system.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sh64/system.h b/include/asm-sh64/system.h index 87ef6f1ad5a4..b1598c26fcb0 100644 --- a/include/asm-sh64/system.h +++ b/include/asm-sh64/system.h | |||
@@ -64,7 +64,7 @@ extern void __xchg_called_with_bad_pointer(void); | |||
64 | #define smp_read_barrier_depends() do { } while (0) | 64 | #define smp_read_barrier_depends() do { } while (0) |
65 | #endif /* CONFIG_SMP */ | 65 | #endif /* CONFIG_SMP */ |
66 | 66 | ||
67 | #define set_rmb(var, value) do { xchg(&var, value); } while (0) | 67 | #define set_rmb(var, value) do { (void)xchg(&var, value); } while (0) |
68 | #define set_mb(var, value) set_rmb(var, value) | 68 | #define set_mb(var, value) set_rmb(var, value) |
69 | 69 | ||
70 | /* Interrupt Control */ | 70 | /* Interrupt Control */ |