diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-07-29 16:42:11 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-07-29 16:42:11 +0000 |
| commit | 019a00c112033e13ce96592d79c530cd88057787 (patch) | |
| tree | d94347115646c572fa13f5e7943aa04ca25a9e7f | |
| parent | f80d5d0112982158193164eade5f2597f09a5b0d (diff) | |
not all the world is an i386. Back out breakage.
| -rw-r--r-- | lib/librthread/rthread_cond.c | 4 | ||||
| -rw-r--r-- | lib/librthread/rthread_mutex.c | 4 | ||||
| -rw-r--r-- | lib/librthread/rthread_rwlock.c | 5 | ||||
| -rw-r--r-- | lib/librthread/rthread_sync.c | 4 |
4 files changed, 4 insertions, 13 deletions
diff --git a/lib/librthread/rthread_cond.c b/lib/librthread/rthread_cond.c index 184d533235f..b9f53fbea9a 100644 --- a/lib/librthread/rthread_cond.c +++ b/lib/librthread/rthread_cond.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread_cond.c,v 1.2 2017/07/29 08:36:23 pirofti Exp $ */ +/* $OpenBSD: rthread_cond.c,v 1.3 2017/07/29 16:42:10 deraadt Exp $ */ /* * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org> * Copyright (c) 2012 Philip Guenther <guenther@openbsd.org> @@ -42,8 +42,6 @@ pthread_cond_init(pthread_cond_t *condp, const pthread_condattr_t *attr) cond->clock = CLOCK_REALTIME; else cond->clock = (*attr)->ca_clock; - - membar_producer(); *condp = cond; return (0); diff --git a/lib/librthread/rthread_mutex.c b/lib/librthread/rthread_mutex.c index cb4b2f0a0b0..0b72c90d88f 100644 --- a/lib/librthread/rthread_mutex.c +++ b/lib/librthread/rthread_mutex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread_mutex.c,v 1.4 2017/07/29 08:36:23 pirofti Exp $ */ +/* $OpenBSD: rthread_mutex.c,v 1.5 2017/07/29 16:42:10 deraadt Exp $ */ /* * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org> * Copyright (c) 2012 Philip Guenther <guenther@openbsd.org> @@ -64,8 +64,6 @@ pthread_mutex_init(pthread_mutex_t *mutexp, const pthread_mutexattr_t *attr) mutex->prioceiling = (*attr)->ma_protocol == PTHREAD_PRIO_PROTECT ? (*attr)->ma_prioceiling : -1; } - - membar_producer(); *mutexp = mutex; return (0); diff --git a/lib/librthread/rthread_rwlock.c b/lib/librthread/rthread_rwlock.c index 8bceba3b6a2..a75e88c52e4 100644 --- a/lib/librthread/rthread_rwlock.c +++ b/lib/librthread/rthread_rwlock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread_rwlock.c,v 1.9 2017/07/29 08:36:23 pirofti Exp $ */ +/* $OpenBSD: rthread_rwlock.c,v 1.10 2017/07/29 16:42:10 deraadt Exp $ */ /* * Copyright (c) 2004,2005 Ted Unangst <tedu@openbsd.org> * Copyright (c) 2012 Philip Guenther <guenther@openbsd.org> @@ -27,8 +27,6 @@ #include <pthread.h> -#include <sys/atomic.h> - #include "rthread.h" static _atomic_lock_t rwlock_init_lock = _SPINLOCK_UNLOCKED; @@ -45,7 +43,6 @@ pthread_rwlock_init(pthread_rwlock_t *lockp, lock->lock = _SPINLOCK_UNLOCKED; TAILQ_INIT(&lock->writers); - membar_producer(); *lockp = lock; return (0); diff --git a/lib/librthread/rthread_sync.c b/lib/librthread/rthread_sync.c index 432469fa522..3f42916d713 100644 --- a/lib/librthread/rthread_sync.c +++ b/lib/librthread/rthread_sync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread_sync.c,v 1.45 2017/07/29 08:36:23 pirofti Exp $ */ +/* $OpenBSD: rthread_sync.c,v 1.46 2017/07/29 16:42:10 deraadt Exp $ */ /* * Copyright (c) 2004,2005 Ted Unangst <tedu@openbsd.org> * Copyright (c) 2012 Philip Guenther <guenther@openbsd.org> @@ -54,8 +54,6 @@ pthread_mutex_init(pthread_mutex_t *mutexp, const pthread_mutexattr_t *attr) mutex->prioceiling = (*attr)->ma_protocol == PTHREAD_PRIO_PROTECT ? (*attr)->ma_prioceiling : -1; } - - membar_producer(); *mutexp = mutex; return (0); |