diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-02-23 13:11:40 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-02-23 13:11:40 +0000 |
| commit | 8c2ed3e9b7805d10816f461c713c63a8363fa61a (patch) | |
| tree | 5a12eaf4c91c09c7cba55c06de0cebd1ae0867d2 /usr/src/lib/libscf | |
| parent | dda1f9a81f5e81013b6df1dd838f8a23774ed0b5 (diff) | |
| parent | 1951a93366b3e52f7c49ec9b2dbfb21bccc56a3e (diff) | |
| download | illumos-joyent-8c2ed3e9b7805d10816f461c713c63a8363fa61a.tar.gz | |
[illumos-gate merge]
commit 1951a93366b3e52f7c49ec9b2dbfb21bccc56a3e
7837 smbios3 64-bit entry point support
commit ec2c76eb1d5ecd7a4fccccefc1bc4aa7c1531606
7854 installboot should set MBR to load partition boot block if it was installed
commit 48bbca816818409505a6e214d0911fda44e622e3
7812 Remove gender specific language
commit e40108ff341f07fe03e96c751c6cf2cb5867d1a8
7898 mdb's ::netstat doesn't print UDP conn_t pointer correctly
Conflicts:
usr/src/uts/common/syscall/poll.c
Diffstat (limited to 'usr/src/lib/libscf')
| -rw-r--r-- | usr/src/lib/libscf/common/lowlevel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/lib/libscf/common/lowlevel.c b/usr/src/lib/libscf/common/lowlevel.c index a348f50db0..eb0d29b236 100644 --- a/usr/src/lib/libscf/common/lowlevel.c +++ b/usr/src/lib/libscf/common/lowlevel.c @@ -23,6 +23,7 @@ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2013, Joyent, Inc. All rights reserved. * Copyright 2016 RackTop Systems. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* @@ -110,7 +111,7 @@ static void scf_value_reset_locked(scf_value_t *val, int and_destroy); /* * Hold and release subhandles. We only allow one thread access to the - * subhandles at a time, and he can use any subset, grabbing and releasing + * subhandles at a time, and it can use any subset, grabbing and releasing * them in any order. The only restrictions are that you cannot hold an * already-held subhandle, and all subhandles must be released before * returning to the original caller. |