diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-05-25 14:08:27 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-05-25 14:08:27 -0400 |
| commit | f390f85acaffd7dd53796db7f94f4df9523ed09c (patch) | |
| tree | 54a128a5b3414b8f1c19455e0aa4ecb05d72ceb3 /usr/src/uts/common/os/strsubr.c | |
| parent | 6a115942cd5340ddb10baaa726ec26d5f707e7fb (diff) | |
| parent | 2576a450861a4a608f6bfabf01759987ff4ad97e (diff) | |
| download | illumos-joyent-f390f85acaffd7dd53796db7f94f4df9523ed09c.tar.gz | |
[illumos-gate merge]
commit 2576a450861a4a608f6bfabf01759987ff4ad97e
13829 genunix: cast between incompatible function types
commit 2817ebc2366683391690bbd0e0dd2e82aaa281f7
13764 bhyve could reduce privileges(5)
commit 90d74ed67b4bac801bf06d75825d9a9e4bd458d0
13786 bhyve could use ASLR
commit 2851030d1db57fd5488bc19a8da8147d79711654
13788 restart of privilege-aware zone init fails
commit 7c94ff60ae7c4cbdb9496a43a9d9eb85568413e3
13566 libm: 'fq[0]' may be used uninitialized
Diffstat (limited to 'usr/src/uts/common/os/strsubr.c')
| -rw-r--r-- | usr/src/uts/common/os/strsubr.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/usr/src/uts/common/os/strsubr.c b/usr/src/uts/common/os/strsubr.c index 1e18a0ce9e..9357e6a234 100644 --- a/usr/src/uts/common/os/strsubr.c +++ b/usr/src/uts/common/os/strsubr.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ +/* All Rights Reserved */ /* @@ -3007,7 +3007,7 @@ strwaitbuf(size_t size, int pri) * GETWAIT Check for read side errors, no M_READ * WRITEWAIT Check for write side errors. * NOINTR Do not return error if nonblocking or timeout. - * STR_NOERROR Ignore all errors except STPLEX. + * STR_NOERROR Ignore all errors except STPLEX. * STR_NOSIG Ignore/hold signals during the duration of the call. * STR_PEEK Pass through the strgeterr(). */ @@ -6631,9 +6631,9 @@ drain_syncq(syncq_t *sq) * * qdrain_syncq can be called (currently) from only one of two places: * drain_syncq - * putnext (or some variation of it). + * putnext (or some variation of it). * and eventually - * qwait(_sig) + * qwait(_sig) * * If called from drain_syncq, we found it in the list of queues needing * service, so there is work to be done (or it wouldn't be in the list). @@ -6653,8 +6653,8 @@ drain_syncq(syncq_t *sq) * * ASSUMES: * One claim - * QLOCK held - * SQLOCK not held + * QLOCK held + * SQLOCK not held * Will release QLOCK before returning */ void @@ -7108,11 +7108,11 @@ static int propagate_syncq(queue_t *qp) { mblk_t *bp, *head, *tail, *prev, *next; - syncq_t *sq; + syncq_t *sq; queue_t *nqp; syncq_t *nsq; boolean_t isdriver; - int moved = 0; + int moved = 0; uint16_t flags; pri_t priority = curthread->t_pri; #ifdef DEBUG @@ -7145,7 +7145,7 @@ propagate_syncq(queue_t *qp) /* debug macro */ SQ_PUTLOCKS_HELD(nsq); #ifdef DEBUG - func = (void (*)())nqp->q_qinfo->qi_putp; + func = (void (*)())(uintptr_t)nqp->q_qinfo->qi_putp; #endif } |