diff options
| author | Richard Braun <rbraun@sceen.net> | 2017-05-29 18:34:46 +0200 |
|---|---|---|
| committer | Richard Braun <rbraun@sceen.net> | 2017-05-29 18:34:46 +0200 |
| commit | 1c6a75ce939d2e7ffd12a3edac7618eb63447e09 (patch) | |
| tree | e2dc8472d1bcdf3f6c86ab2a5405cf8917a725ca | |
| parent | e30e2f39a145d61ddf3d3eb450b5771a90e8c0f2 (diff) | |
kern/atomic: provide _acq_rel macros instead of _seq_cst
| -rw-r--r-- | kern/atomic.h | 6 | ||||
| -rw-r--r-- | kern/panic.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kern/atomic.h b/kern/atomic.h index 9e26ad5a..75b07012 100644 --- a/kern/atomic.h +++ b/kern/atomic.h @@ -122,12 +122,12 @@ MACRO_END #define atomic_cas_release(ptr, oval, nval) \ atomic_cas(ptr, oval, nval, ATOMIC_RELEASE) -#define atomic_cas_seq_cst(ptr, oval, nval) \ - atomic_cas(ptr, oval, nval, ATOMIC_SEQ_CST) +#define atomic_cas_acq_rel(ptr, oval, nval) \ + atomic_cas(ptr, oval, nval, ATOMIC_ACQ_REL) #define atomic_swap_acquire(ptr, val) atomic_swap(ptr, val, ATOMIC_ACQUIRE) #define atomic_swap_release(ptr, val) atomic_swap(ptr, val, ATOMIC_RELEASE) -#define atomic_swap_seq_cst(ptr, val) atomic_swap(ptr, val, ATOMIC_SEQ_CST) +#define atomic_swap_acq_rel(ptr, val) atomic_swap(ptr, val, ATOMIC_ACQ_REL) #define atomic_fetch_add_acq_rel(ptr, val) \ atomic_fetch_add(ptr, val, ATOMIC_ACQ_REL) diff --git a/kern/panic.c b/kern/panic.c index 34d8c138..9e7d1d53 100644 --- a/kern/panic.c +++ b/kern/panic.c @@ -31,7 +31,7 @@ panic(const char *format, ...) va_list list; unsigned long already_done; - already_done = atomic_swap_seq_cst(&panic_done, 1); + already_done = atomic_swap(&panic_done, 1, ATOMIC_SEQ_CST); if (already_done) { for (;;) { |