diff options
| author |   dlg <dlg@openbsd.org> | 2015-02-10 23:54:09 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2015-02-10 23:54:09 +0000 |
| commit | 119922d2e40029965b8a0325480421c0d86a04eb (patch) | |
| tree | e17e5af9a8b553674d6c150a12e61496dcd7b2cc | |
| parent | Be less chatty on constraint errors. (diff) | |
| download | wireguard-openbsd-119922d2e40029965b8a0325480421c0d86a04eb.tar.xz wireguard-openbsd-119922d2e40029965b8a0325480421c0d86a04eb.zip | |
atomic_{cas,swap}_ptr takes a volatile void *, not a volatile void **.
this makes mips64 consistent with the api and all other archs.
testing and ok miod@
| -rw-r--r-- | sys/arch/mips64/include/atomic.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/arch/mips64/include/atomic.h b/sys/arch/mips64/include/atomic.h index 6db141e26f7..e87c11d36b8 100644 --- a/sys/arch/mips64/include/atomic.h +++ b/sys/arch/mips64/include/atomic.h @@ -1,4 +1,4 @@ -/* $OpenBSD: atomic.h,v 1.9 2014/09/30 06:51:58 jmatthew Exp $ */ +/* $OpenBSD: atomic.h,v 1.10 2015/02/10 23:54:09 dlg Exp $ */ /* Public Domain */ @@ -95,8 +95,9 @@ _atomic_cas_ulong(volatile unsigned long *p, unsigned long o, unsigned long n) #define atomic_cas_ulong(_p, _o, _n) _atomic_cas_ulong((_p), (_o), (_n)) static inline void * -_atomic_cas_ptr(volatile void **p, void *o, void *n) +_atomic_cas_ptr(volatile void *pp, void *o, void *n) { + void * volatile *p = pp; void *rv, *wv; __asm__ volatile ( @@ -153,8 +154,9 @@ _atomic_swap_ulong(volatile unsigned long *uip, unsigned long v) static inline void * -_atomic_swap_ptr(volatile void **uip, void *n) +_atomic_swap_ptr(volatile void *uipp, void *n) { + void * volatile *uip = uipp; void *o, *t; __asm__ volatile ( |