diff options
| author | Paul Irofti <pirofti@cvs.openbsd.org> | 2012-11-19 15:03:56 +0000 |
|---|---|---|
| committer | Paul Irofti <pirofti@cvs.openbsd.org> | 2012-11-19 15:03:56 +0000 |
| commit | d6b26a98fcca45808b4798c6ea16a2341cf4f2a9 (patch) | |
| tree | adfa85939fdc33c28edbef7a62c76a077eea9358 | |
| parent | 7424f1f9ce11363fa6ab90bab841b29c37767602 (diff) | |
Use a more descriptive name for the userland cas operation.
Substitute atomic_ucas_32 with futex_atomic_ucas_int32 to make it
obvious who's using this api.
Suggested by and okay kettenis@.
| -rw-r--r-- | sys/arch/i386/include/atomic.h | 4 | ||||
| -rw-r--r-- | sys/compat/linux/linux_futex.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/i386/include/atomic.h b/sys/arch/i386/include/atomic.h index fc5408cb968..292654f39d8 100644 --- a/sys/arch/i386/include/atomic.h +++ b/sys/arch/i386/include/atomic.h @@ -1,4 +1,4 @@ -/* $OpenBSD: atomic.h,v 1.9 2011/07/09 01:49:16 pirofti Exp $ */ +/* $OpenBSD: atomic.h,v 1.10 2012/11/19 15:03:55 pirofti Exp $ */ /* $NetBSD: atomic.h,v 1.1.2.2 2000/02/21 18:54:07 sommerfeld Exp $ */ /*- @@ -100,7 +100,7 @@ i486_atomic_cas_int(volatile u_int *ptr, u_int expect, u_int set) } int ucas_32(volatile int32_t *, int32_t, int32_t); -#define atomic_ucas_32 ucas_32 +#define futex_atomic_ucas_int32 ucas_32 #define atomic_setbits_int i386_atomic_setbits_l #define atomic_clearbits_int i386_atomic_clearbits_l diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c index c8eb1cc8e2e..3edfa44dd72 100644 --- a/sys/compat/linux/linux_futex.c +++ b/sys/compat/linux/linux_futex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: linux_futex.c,v 1.9 2012/06/19 11:47:10 pirofti Exp $ */ +/* $OpenBSD: linux_futex.c,v 1.10 2012/11/19 15:03:55 pirofti Exp $ */ /* $NetBSD: linux_futex.c,v 1.26 2010/07/07 01:30:35 chs Exp $ */ /*- @@ -634,7 +634,7 @@ futex_atomic_op(struct proc *p, int encoded_op, void *uaddr) } oldval = nval; - error = atomic_ucas_32(uaddr, cval, nval); + error = futex_atomic_ucas_int32(uaddr, cval, nval); if (oldval == cval || error) { break; } |