diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-07 13:07:27 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-07 13:07:27 +0000 |
| commit | 8af2cc9f404037fc70d217d328172e2f24f441eb (patch) | |
| tree | ff3485d50708b2ecddcbeae8a2d8280f4999af6d /usr/src/lib/libc/port/threads/pthread.c | |
| parent | 6fb307ce14869b1c3684d0948a7844194c69b5bd (diff) | |
| parent | 9890ff8357a674572254e0be06b175a1e8eab4b0 (diff) | |
| download | illumos-joyent-8af2cc9f404037fc70d217d328172e2f24f441eb.tar.gz | |
[illumos-gate merge]
commit 9890ff8357a674572254e0be06b175a1e8eab4b0
10028 loader: implement framebuffer console
10029 common/font: create shared font.c
10030 import pnglite into usr/src/common/pnglite
8918 loader.efi: add vesa edid support
10031 loader: import tem for loader console
10032 loader: implement tem utf-8 support
10033 ficl: add simple gfx words
10034 loader: use term-drawrect for menu frame
10035 loader: add alpha blending for gfx_fb
10036 ficl: add fb-putimage
10037 loader: add illumos.png logo
10038 loader: replace gop and vesa with framebuffer
10039 loader: build rules for new font setup
10040 loader: gfx use GOP Blt() function in visual_io callbacks
commit f33b666290305a2b2c134d23cbd1e70e06bf36fd
7796 uts: ldterm default to utf-8
commit adc2b73db62a4506a57dfd1ce89bcadc4a60a29d
7784 uts: console input should support Unicode
commit 1f5207b7604fb44407eb4342aff613f7c4508508
10063 basic support for smatch
10153 checkpaths shouldn't check packaging exceptions
commit c0455f334914631f42eb41177d677e2820ee6506
9478 etdump: Add the etdump utility for dumping El Torito boot catalog information.
commit c62757b2b8b6c26589d7704d0ff20beb107fcd9a
10154 zfs: cast between incompatible function types
commit 781f142d2ae880bb893875d2a114552171a5c3e5
10064 loader: zfs reader should not probe partitionless disks
commit 8a06b3d6467c15646e663c05086378f16288af85
10155 ip: cast between incompatible function types
commit c5749750a3e052f1194f65a303456224c51dea63
10157 sgs/libld: cast between incompatible function types
commit 5e90af26eb6ed2206c2a5f5131a1f3c377d6e8c4
10158 sgs/rtld: cast between incompatible function types
commit adc04c2d55dd20cc6a0622f1147c0b084cdc3099
10159 libc: cast between incompatible function types
commit 9419bc2fc61b54b25a4e45211d31fcb920ff67cc
10162 Sun/Solaris/Kstat: cast between incompatible function types
Conflicts:
usr/src/tools/env/illumos.sh
Diffstat (limited to 'usr/src/lib/libc/port/threads/pthread.c')
| -rw-r--r-- | usr/src/lib/libc/port/threads/pthread.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/usr/src/lib/libc/port/threads/pthread.c b/usr/src/lib/libc/port/threads/pthread.c index 34b4b4c73c..dc0123361d 100644 --- a/usr/src/lib/libc/port/threads/pthread.c +++ b/usr/src/lib/libc/port/threads/pthread.c @@ -177,6 +177,14 @@ pthread_create(pthread_t *thread, const pthread_attr_t *attr, return (error); } +static void +_mutex_unlock_wrap(void *ptr) +{ + mutex_t *mp = ptr; + + (void) mutex_unlock(mp); +} + /* * pthread_once: calls given function only once. * it synchronizes via mutex in pthread_once_t structure @@ -192,7 +200,7 @@ pthread_once(pthread_once_t *once_control, void (*init_routine)(void)) if (once->once_flag == PTHREAD_ONCE_NOTDONE) { (void) mutex_lock(&once->mlock); if (once->once_flag == PTHREAD_ONCE_NOTDONE) { - pthread_cleanup_push(mutex_unlock, &once->mlock); + pthread_cleanup_push(_mutex_unlock_wrap, &once->mlock); (*init_routine)(); pthread_cleanup_pop(0); membar_producer(); |