[illumos-gate merge]20151001release-20151001

commit adb26135f9399e574196b45d6ab3ba1bb470e60f
    4648 detach(9e): Extra space between 'prefix' and 'detach'
commit bcfd4cacb8887a687a4dd27cbaeec75e65f0e9de
    5663 sysinfo(2): Missing spaces in the man page
commit 118975ce0091e85fa58568a5700555eec6330843
    5678 mutex_init(3C): Extra space in man page
commit ba647289fedd78140d3b8288576aeb23fcf57043
    5706 dldump(3c)/dlopen(3c): Extra spaces in the man page
commit 9a91647e0ac8a8e02f9e9d8345e751e0c02c0b19
    6050 kstat_create(9f) should document KSTAT_TYPE_RAW and KSTAT_TYPE_TIMER
commit e057ac923deda9b3a28f8ec5b927ccf0a9479ba9
    6097 ks_snapshot(9e): Typo in the man page
commit c4921527904c6350c4ac33b0f936c4920cb38d39
    5036 taskq(9f): Typos in the man page
commit cebfa3c2fea024bb483d40f6d0cacd3298540cab
    5657 Typo in rpcbind(3nsl): ssvcaddr
commit cf6fe0ff9e996915d750fb1fc98477c23e9c5e1d
    4514 k5srvutil(1m): The default keytab file is /etc/krb5/krb5.keytab
commit 20110e4e4d2d67b7e7c7309d1733ee00a499c491
    5730 Typos in rpc_clnt_create(3nsl) man page
commit 395c7a3dcfc66b8b671dc4b3c4a2f0ca26449922
    6266 harden dtrace_difo_chunksize() with respect to malicious DIF
commit 6a9ca708361200b105f7a016216808e6058d17cb
    6263 add missing cc clobbers to intel atomic inlines

13 files changed, 59 insertions, 91 deletions

diff --git a/usr/src/man/man1m/k5srvutil.1m b/usr/src/man/man1m/k5srvutil.1m
index bc459ef755..3520371443 100644
--- a/usr/src/man/man1m/k5srvutil.1m
+++ b/usr/src/man/man1m/k5srvutil.1m
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH K5SRVUTIL 1M "Aug 29, 2006"
+.TH K5SRVUTIL 1M "Jul 25, 2015"
 .SH NAME
 k5srvutil \- host key table (keytab) manipulation utility
 .SH SYNOPSIS
@@ -13,7 +13,6 @@ k5srvutil \- host key table (keytab) manipulation utility
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBk5srvutil\fR command allows a system manager to list or change keys
 currently in his keytab or to add new keys to the keytab.
@@ -67,14 +66,13 @@ Deletes particular keys in the keytab, interactively prompting for each key.
 
 .sp
 .LP
-In all cases, the default keytab file is \fB/etc/krb5.keytab\fR file unless
-this is overridden by the \fB-f\fR option.
+In all cases, the default keytab file is \fB/etc/krb5/krb5.keytab\fR unless
+overridden by the \fB-f\fR option.
 .sp
 .LP
 \fBk5srvutil\fR uses the \fBkadmin\fR(1M) program to edit the keytab in place.
 However, old keys are retained, so they are available in case of failure.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -83,7 +81,7 @@ The following options are supported:
 \fB\fB-f\fR \fIfilename\fR\fR
 .ad
 .RS 15n
-Specify a keytab file other than the default file, \fB/etc/krb5.keytab\fR.
+Specify a keytab file other than the default file, \fB/etc/krb5/krb5.keytab\fR.
 .RE
 
 .sp
@@ -106,7 +104,6 @@ Displays old and new keys when using the \fBchange\fR operand.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -122,6 +119,5 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBktutil\fR(1), \fBkadmin\fR(1M), \fBattributes\fR(5)
diff --git a/usr/src/man/man2/sysinfo.2 b/usr/src/man/man2/sysinfo.2
index 648fce0403..c33863ff5c 100644
--- a/usr/src/man/man2/sysinfo.2
+++ b/usr/src/man/man2/sysinfo.2
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH SYSINFO 2 "Jan 29, 2009"
+.TH SYSINFO 2 "Sep 7, 2015"
 .SH NAME
 sysinfo \- get and set system information strings
 .SH SYNOPSIS
@@ -16,7 +16,6 @@ sysinfo \- get and set system information strings
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBsysinfo()\fR function copies information relating to the operating
 system on which the process is executing into the buffer pointed to by
@@ -38,7 +37,7 @@ The values for \fIcommand\fR are as follows:
 .sp .6
 .RS 4n
 Copy into the array pointed to by \fIbuf\fR the string that would be returned
-by \fBuname\fR(2) in the \fIsysname\fRfield. This is the name of the
+by \fBuname\fR(2) in the \fIsysname\fR field. This is the name of the
 implementation of the operating system, for example, \fBSunOS\fR or \fBUTS\fR.
 .RE
 
@@ -51,7 +50,7 @@ implementation of the operating system, for example, \fBSunOS\fR or \fBUTS\fR.
 .RS 4n
 Copy into the array pointed to by \fIbuf\fR a string that names the present
 host machine. This is the string that would be returned by \fBuname()\fR in the
-\fInodename\fRfield. This hostname or nodename is often the name the machine is
+\fInodename\fR field. This hostname or nodename is often the name the machine is
 known by locally. The \fIhostname\fR is the name of this machine as a node in
 some network. Different networks might have different names for the node, but
 presenting the nodename to the appropriate network directory or name-to-address
@@ -94,7 +93,7 @@ or \fB4.1\fR.
 .sp .6
 .RS 4n
 Copy into the array pointed to by \fIbuf\fR the string that would be returned
-by \fBuname\fR(2) in the \fIversion\fRfield. The syntax and semantics of this
+by \fBuname\fR(2) in the \fIversion\fR field. The syntax and semantics of this
 string are defined by the system provider.
 .RE
 
@@ -288,7 +287,6 @@ purpose of adopting the DHCP maintenance of the interface configured by
 .RE
 
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, the value returned indicates the buffer size in
 bytes required to hold the complete value and the terminating null character.
@@ -300,7 +298,6 @@ null character.
 .LP
 Otherwise, \(mi1 is returned and \fBerrno\fR is set to indicate the error.
 .SH ERRORS
-.sp
 .LP
 The \fBsysinfo()\fR function will fail if:
 .sp
@@ -333,7 +330,6 @@ process.
 .RE
 
 .SH USAGE
-.sp
 .LP
 In many cases there is no corresponding programming interface to set these
 values; such strings are typically settable only by the system administrator
@@ -345,7 +341,6 @@ hard-coded in the version of the operating system.
 A good estimation for \fIcount\fR is 257, which is likely to cover all strings
 returned by this interface in typical installations.
 .SH SEE ALSO
-.sp
 .LP
 \fBboot\fR(1M), \fBdhcpagent\fR(1M), \fBgetisax\fR(2), \fBuname\fR(2),
 \fBgethostid\fR(3C), \fBgethostname\fR(3C), \fBsysconf\fR(3C),
diff --git a/usr/src/man/man3c/dldump.3c b/usr/src/man/man3c/dldump.3c
index 8f8860345e..504fe7b71b 100644
--- a/usr/src/man/man3c/dldump.3c
+++ b/usr/src/man/man3c/dldump.3c
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH DLDUMP 3C "Mar 1, 2004"
+.TH DLDUMP 3C "Sep 7, 2015"
 .SH NAME
 dldump \- create a new file from a dynamic object component of the calling
 process
@@ -12,11 +12,10 @@ process
 .nf
 #include <dlfcn.h>
 
-\fBint\fR \fBdldump\fR(\fBconst char *\fR \fIipath\fR, \fBconst char *\fR \fIopath\fR, \fBint\fR \fIflags\fR);
+\fBint\fR \fBdldump\fR(\fBconst char *\fR\fIipath\fR, \fBconst char *\fR\fIopath\fR, \fBint\fR \fIflags\fR);
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBdldump()\fR function creates a new dynamic object \fIopath\fR from an
 existing dynamic object \fIipath\fR that is bound to the current process. An
@@ -223,7 +222,6 @@ for example, will not start where the original executable called
 \fBdldump()\fR. It will gain control at the executable's normal entry point.
 See \fBEXAMPLES\fR.
 .SH RETURN VALUES
-.sp
 .LP
 On successful creation of the new object, \fBdldump()\fR returns \fB0\fR.
 Otherwise, a non-zero value is returned and more detailed diagnostic
@@ -395,13 +393,11 @@ this may invalidate the calling image; thus, following the call to
 \fBdldump()\fR, only a call to \fB_Exit\fR(2) should be made.
 
 .SH USAGE
-.sp
 .LP
 The \fBdldump()\fR function is one of a family of functions that give the user
 direct access to the dynamic linking facilities. These facilities are available
 to dynamically-linked processes only. See \fILinker and Libraries Guide\fR).
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -417,7 +413,6 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBld\fR(1), \fBld.so.1\fR(1), \fBstrip\fR(1), \fB_Exit\fR(2), \fBbrk\fR(2),
 \fBexec\fR(2), \fB_exithandle\fR(3C), \fBdladdr\fR(3C), \fBdlclose\fR(3C),
@@ -427,7 +422,6 @@ MT-Level	MT-Safe
 .LP
 \fILinker and Libraries Guide\fR
 .SH NOTES
-.sp
 .LP
 These functions are available to dynamically-linked processes only.
 .sp
diff --git a/usr/src/man/man3c/dlopen.3c b/usr/src/man/man3c/dlopen.3c
index 6555f23003..b72d070579 100644
--- a/usr/src/man/man3c/dlopen.3c
+++ b/usr/src/man/man3c/dlopen.3c
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH DLOPEN 3C "Feb 4, 2005"
+.TH DLOPEN 3C "Sep 7, 2015"
 .SH NAME
 dlopen, dlmopen \- gain access to an executable object file
 .SH SYNOPSIS
@@ -12,16 +12,15 @@ dlopen, dlmopen \- gain access to an executable object file
 #include <dlfcn.h>
 #include <link.h>
 
-\fBvoid *\fR \fBdlopen\fR(\fBconst char *\fR\fIpathname\fR, \fBint\fR \fImode\fR);
+\fBvoid *\fR\fBdlopen\fR(\fBconst char *\fR\fIpathname\fR, \fBint\fR \fImode\fR);
 .fi
 
 .LP
 .nf
-\fBvoid *\fR \fBdlmopen\fR(\fBLmid_t\fR \fIlmid\fR, \fBconst char *\fR\fIpathname\fR, \fBint\fR \fImode\fR);
+\fBvoid *\fR\fBdlmopen\fR(\fBLmid_t\fR \fIlmid\fR, \fBconst char *\fR\fIpathname\fR, \fBint\fR \fImode\fR);
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBdlopen()\fR function makes an executable object file available to a
 running process. \fBdlopen()\fR returns to the process a \fIhandle\fR that the
@@ -274,7 +273,6 @@ are opened on a new link-map list must express all of their dependencies.
 .RE
 
 .SH RETURN VALUES
-.sp
 .LP
 The \fBdlopen()\fR function returns \fINULL\fR if \fIpathname\fR cannot be
 found, cannot be opened for reading, or is not a shared object or a relocatable
@@ -283,14 +281,12 @@ process of loading \fIpathname\fR or relocating its symbolic references. See
 \fBNOTES\fR. Additional diagnostic information is available through
 \fBdlerror()\fR.
 .SH USAGE
-.sp
 .LP
 The \fBdlopen()\fR and \fBdlmopen()\fR functions are members of a family of
 functions that give the user direct access to the dynamic linking facilities.
 This family of functions is available only to dynamically-linked processes. See
 the \fILinker and Libraries Guide\fR.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -308,7 +304,6 @@ MT\(miLevel	MT\(miSafe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBld\fR(1), \fBld.so.1\fR(1), \fBdladdr\fR(3C), \fBdlclose\fR(3C),
 \fBdldump\fR(3C), \fBdlerror\fR(3C), \fBdlinfo\fR(3C), \fBdlsym\fR(3C),
@@ -317,7 +312,6 @@ MT\(miLevel	MT\(miSafe
 .LP
 \fILinker and Libraries Guide\fR
 .SH NOTES
-.sp
 .LP
 If \fIpathname\fR has dependencies on other objects, these objects are
 automatically loaded by \fBdlopen()\fR. The directory search path used to find
diff --git a/usr/src/man/man3c/mutex_init.3c b/usr/src/man/man3c/mutex_init.3c
index 3a42aee0ec..a9b75a4155 100644
--- a/usr/src/man/man3c/mutex_init.3c
+++ b/usr/src/man/man3c/mutex_init.3c
@@ -10,7 +10,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH MUTEX_INIT 3C "Oct 22, 2014"
+.TH MUTEX_INIT 3C "Sep 7, 2015"
 .SH NAME
 mutex_init, mutex_lock, mutex_trylock, mutex_unlock, mutex_consistent,
 mutex_destroy \- mutual exclusion locks
@@ -21,7 +21,7 @@ cc -mt [ \fIflag\fR... ] \fIfile\fR... [ \fIlibrary\fR... ]
 #include <thread.h>
 #include <synch.h>
 
-\fBint\fR \fBmutex_init\fR(\fBmutex_t *\fR\fImp\fR, \fBint\fR \fItype\fR, \fBvoid *\fR \fIarg\fR);
+\fBint\fR \fBmutex_init\fR(\fBmutex_t *\fR\fImp\fR, \fBint\fR \fItype\fR, \fBvoid *\fR\fIarg\fR);
 .fi
 
 .LP
@@ -50,7 +50,6 @@ cc -mt [ \fIflag\fR... ] \fIfile\fR... [ \fIlibrary\fR... ]
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 Mutual exclusion locks (mutexes) prevent multiple threads from simultaneously
 executing critical sections of code that access shared data (that is, mutexes
@@ -66,7 +65,6 @@ Mutexes can be used to synchronize threads between processes if the mutexes are
 allocated in writable memory and shared among the cooperating processes (see
 \fBmmap\fR(2)), and have been initialized for this task.
 .SS "Initialize"
-.sp
 .LP
 Mutexes are either intra-process or inter-process, depending  upon the argument
 passed implicitly or explicitly  to the initialization of that mutex. A
@@ -325,7 +323,6 @@ Same as (\fBUSYNC_THREAD\fR | \fBLOCK_RECURSIVE\fR | \fBLOCK_ERRORCHECK\fR)
 .RE
 
 .SS "Lock and Unlock"
-.sp
 .LP
 A critical section of code is enclosed by  a the call to lock the mutex and the
 call to unlock the mutex to protect it from simultaneous access by multiple
@@ -371,18 +368,15 @@ policy will determine which thread gets the mutex. If the calling thread is not
 the owner of the lock, no error status is returned, and the behavior of the
 program is undefined.
 .SS "Destroy"
-.sp
 .LP
 The \fBmutex_destroy()\fR function destroys the mutex object referenced by
 \fImp\fR. The mutex object becomes uninitialized. The space used by the
 destroyed mutex variable is not freed. It needs to be explicitly reclaimed.
 .SH RETURN VALUES
-.sp
 .LP
 If successful, these functions return \fB0\fR. Otherwise, an error number is
 returned.
 .SH ERRORS
-.sp
 .LP
 The \fBmutex_init()\fR function will fail if:
 .sp
@@ -535,7 +529,6 @@ having an inconsistent state (\fBEOWNERDEAD\fR).
 
 .SH EXAMPLES
 .SS "Single Gate"
-.sp
 .LP
 The following example uses one global mutex as a gate-keeper to permit each
 thread exclusive sequential access to the code within the user-defined
@@ -572,7 +565,6 @@ void * change_global_data(void *null){
 .in -2
 
 .SS "Multiple Instruction Single Data"
-.sp
 .LP
 The previous example, the mutex, the code it owns, and the data it protects was
 enclosed in one function. The next example uses C++ features to accommodate
@@ -638,7 +630,6 @@ void * change_global_data(void *)	{
 .in -2
 
 .SS "Interprocess Locking"
-.sp
 .LP
 A mutex can protect data that is shared among processes. The mutex would need
 to be initialized as  \fBUSYNC_PROCESS\fR. One process initializes the
@@ -751,7 +742,6 @@ void test_argv(char argv1[])   {
 .in -2
 
 .SS "Solaris Interprocess Robust Locking"
-.sp
 .LP
 A mutex can protect data that is shared among processes robustly. The mutex
 would need to be initialized as \fBUSYNC_PROCESS\fR | \fBLOCK_ROBUST\fR. One
@@ -854,7 +844,6 @@ void create_shared_memory() {
 .in -2
 
 .SS "Dynamically Allocated Mutexes"
-.sp
 .LP
 The following example allocates and frees memory in which a mutex is embedded.
 .sp
@@ -913,7 +902,6 @@ free(r);                /* then free memory */
 .LP
 If the mutex is not destroyed, the program could have memory leaks.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -931,7 +919,6 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBmmap\fR(2), \fBshmop\fR(2), \fBpthread_mutexattr_getprioceiling\fR(3C),
 \fBpthread_mutexattr_getprotocol\fR(3C), \fBpthread_mutexattr_getrobust\fR(3C),
@@ -939,7 +926,6 @@ MT-Level	MT-Safe
 \fBpthread_mutex_init\fR(3C), \fBattributes\fR(5), \fBmutex\fR(5),
 \fBstandards\fR(5)
 .SH NOTES
-.sp
 .LP
 Previous releases of Solaris provided the \fBUSYNC_PROCESS_ROBUST\fR mutex
 type. This type is now deprecated but is still supported for source and binary
diff --git a/usr/src/man/man3nsl/rpc_clnt_create.3nsl b/usr/src/man/man3nsl/rpc_clnt_create.3nsl
index 324c26488e..67f37cf3a1 100644
--- a/usr/src/man/man3nsl/rpc_clnt_create.3nsl
+++ b/usr/src/man/man3nsl/rpc_clnt_create.3nsl
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH RPC_CLNT_CREATE 3NSL "Dec 16, 2013"
+.TH RPC_CLNT_CREATE 3NSL "Jul 25, 2015"
 .SH NAME
 rpc_clnt_create, clnt_control, clnt_create, clnt_create_timed,
 clnt_create_vers, clnt_create_vers_timed, clnt_destroy, clnt_dg_create,
@@ -29,8 +29,8 @@ of CLIENT handles
 .LP
 .nf
 \fBCLIENT *\fR\fBclnt_create_timed\fR(\fBconst char *\fR\fIhost\fR, \fBconst rpcprog_t\fR \fIprognum\fR,
-     \fBconst rpcvers_t\fR \fIversnum\fR, \fBconst\fR \fInettype\fR,
-     \fBconst struct timeval *\fR\fItimetout\fR);
+     \fBconst rpcvers_t\fR \fIversnum\fR, \fBconst char *\fR\fInettype\fR,
+     \fBconst struct timeval *\fR\fItimeout\fR);
 .fi
 
 .LP
@@ -120,7 +120,6 @@ of CLIENT handles
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBRPC\fR library routines allow  \fBC\fR language programs to make procedure
 calls on other machines across the network. First a \fBCLIENT\fR handle is
@@ -135,7 +134,6 @@ When the \fB-mt\fR option is specified, \fBrpc_createerr\fR becomes a macro
 that enables each thread to have its own \fBrpc_createerr\fR. See
 \fBthreads\fR(5).
 .SS "Routines"
-.sp
 .LP
 See \fBrpc\fR(3NSL) for the definition of the \fBCLIENT\fR data structure.
 .sp
@@ -547,7 +545,6 @@ value for \fBrpc_createerr\fR.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5)  for descriptions of the following attributes:
 .sp
@@ -567,7 +564,6 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBrpcbind\fR(1M), \fBrpc\fR(3NSL), \fBrpc_clnt_auth\fR(3NSL),
 \fBrpc_clnt_calls\fR(3NSL), \fBrpc_svc_create\fR(3NSL),
diff --git a/usr/src/man/man3nsl/rpcbind.3nsl b/usr/src/man/man3nsl/rpcbind.3nsl
index 03963556ef..15d0fea75f 100644
--- a/usr/src/man/man3nsl/rpcbind.3nsl
+++ b/usr/src/man/man3nsl/rpcbind.3nsl
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH RPCBIND 3NSL "Nov 24, 2014"
+.TH RPCBIND 3NSL "Jul 25, 2015"
 .SH NAME
 rpcbind, rpcb_getmaps, rpcb_getaddr, rpcb_gettime, rpcb_rmtcall, rpcb_set,
 rpcb_unset \- library routines for RPC bind service
@@ -22,7 +22,7 @@ rpcb_unset \- library routines for RPC bind service
 .LP
 .nf
 \fBbool_t\fR  \fBrpcb_getaddr\fR(\fBconst rpcprog_t\fR  \fIprognum\fR, \fBconst rpcvers_t\fR \fIversnum\fR,
-     \fBconst struct netconfig *\fR\fInetconf\fR, \fBstruct netbuf *\fR\fIssvcaddr\fR,
+     \fBconst struct netconfig *\fR\fInetconf\fR, \fBstruct netbuf *\fR\fIsvcaddr\fR,
      \fBconst char *\fR\fIhost\fR);
 .fi
 
diff --git a/usr/src/man/man9e/detach.9e b/usr/src/man/man9e/detach.9e
index 646139e49c..544cb7536e 100644
--- a/usr/src/man/man9e/detach.9e
+++ b/usr/src/man/man9e/detach.9e
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH DETACH 9E "Dec 7, 2003"
+.TH DETACH 9E "Jul 25, 2015"
 .SH NAME
 detach \- detach or suspend a device
 .SH SYNOPSIS
@@ -14,7 +14,7 @@ detach \- detach or suspend a device
 
 
 
-\fBint prefix\fR \fBdetach\fR(\fBdev_info_t *\fR \fIdip\fR, \fBddi_detach_cmd_t\fR \fIcmd\fR);
+\fBint prefix\fR\fBdetach\fR(\fBdev_info_t *\fR \fIdip\fR, \fBddi_detach_cmd_t\fR \fIcmd\fR);
 .fi
 
 .SH INTERFACE LEVEL
diff --git a/usr/src/man/man9e/ks_snapshot.9e b/usr/src/man/man9e/ks_snapshot.9e
index f096a67557..47d490d4bc 100644
--- a/usr/src/man/man9e/ks_snapshot.9e
+++ b/usr/src/man/man9e/ks_snapshot.9e
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH KS_SNAPSHOT 9E "Dec 4, 2002"
+.TH KS_SNAPSHOT 9E "Sep 7, 2015"
 .SH NAME
 ks_snapshot \- take a snapshot of kstat data
 .SH SYNOPSIS
@@ -20,11 +20,9 @@ ks_snapshot \- take a snapshot of kstat data
 .fi
 
 .SH INTERFACE LEVEL
-.sp
 .LP
 Solaris DDI specific (Solaris DDI).
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIksp\fR \fR
@@ -70,7 +68,6 @@ Copy statistics from the buffer to the driver.
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBkstat\fR mechanism allows for an optional \fBks_snapshot()\fR function
 to copy \fBkstat\fR data. This is the routine that is called to marshall the
@@ -107,7 +104,7 @@ raw statistics. The \fBks_private\fR field is available for this purpose. Its
 use is entirely at the provider's discretion.
 .sp
 .LP
-No \fBkstat\fR locking should be done inside the \fBks_update()\fR routine. The
+No \fBkstat\fR locking should be done inside the \fBks_snapshot()\fR routine. The
 caller will already be holding the \fBkstat\fR's \fBks_lock\fR (to ensure
 consistent data) and will prevent the \fBkstat\fR from being removed.
 .RS +4
@@ -123,7 +120,6 @@ Data gets copied from the \fBkstat\fR to the buffer on \fBKSTAT_READ\fR, and
 from the buffer to the \fBkstat\fR on \fBKSTAT_WRITE\fR.
 .RE
 .SH RETURN VALUES
-.sp
 .ne 2
 .na
 \fB\fB0\fR\fR
@@ -151,7 +147,6 @@ For any other error
 .RE
 
 .SH CONTEXT
-.sp
 .LP
 This function is called from user context only.
 .SH EXAMPLES
@@ -192,7 +187,6 @@ xxx_kstat_snapshot(kstat_t *ksp, void *buf, int rw)
 .sp
 
 .SH SEE ALSO
-.sp
 .LP
 \fBks_update\fR(9E), \fBkstat_create\fR(9F), \fBkstat_install\fR(9F),
 \fBkstat\fR(9S)
diff --git a/usr/src/man/man9f/kstat_create.9f b/usr/src/man/man9f/kstat_create.9f
index 2f6cd3e878..322b8d9d88 100644
--- a/usr/src/man/man9f/kstat_create.9f
+++ b/usr/src/man/man9f/kstat_create.9f
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH KSTAT_CREATE 9F "Nov 13, 2006"
+.TH KSTAT_CREATE 9F "Sep 7, 2015"
 .SH NAME
 kstat_create \- create and initialize a new kstat
 .SH SYNOPSIS
@@ -20,11 +20,9 @@ kstat_create \- create and initialize a new kstat
 .fi
 
 .SH INTERFACE LEVEL
-.sp
 .LP
 Solaris DDI specific (Solaris DDI)
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIks_module\fR\fR
@@ -75,10 +73,19 @@ The type of \fBkstat\fR to allocate. Valid types are:
 .sp
 .ne 2
 .na
+\fB\fBKSTAT_TYPE_RAW\fR\fR
+.ad
+.RS 20n
+Raw data; allows more than one data record per \fBkstat\fR.
+.RE
+
+.sp
+.ne 2
+.na
 \fB\fBKSTAT_TYPE_NAMED\fR\fR
 .ad
 .RS 20n
-Allows more than one data record per \fBkstat\fR.
+Name=value pairs; allows more than one data record per \fBkstat\fR.
 .RE
 
 .sp
@@ -96,7 +103,16 @@ Interrupt; only one data record per \fBkstat\fR.
 \fB\fBKSTAT_TYPE_IO\fR\fR
 .ad
 .RS 20n
-\fBI/O\fR; only one data record per \fBkstat\fR
+\fBI/O\fR; only one data record per \fBkstat\fR.
+.RE
+
+.sp
+.ne 2
+.na
+\fB\fBKSTAT_TYPE_TIMER\fR\fR
+.ad
+.RS 20n
+Event timer statistics; allows more than one data record per \fBkstat\fR.
 .RE
 
 .RE
@@ -157,7 +173,6 @@ goes away.
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBkstat_create()\fR is used in conjunction with \fBkstat_install\fR(9F) to
 allocate and initialize a \fBkstat\fR(9S) structure. The method is generally as
@@ -183,12 +198,10 @@ have the \fBks_data\fR field set at this time. The provider may also set the
 Once the \fBkstat\fR is completely initialized, \fBkstat_install\fR(9F) is used
 to make the \fBkstat\fR accessible to the outside world.
 .SH RETURN VALUES
-.sp
 .LP
 If successful, \fBkstat_create()\fR returns a pointer to the allocated
 \fBkstat\fR. \fINULL\fR is returned upon failure.
 .SH CONTEXT
-.sp
 .LP
 \fBkstat_create()\fR can be called from user or kernel context.
 .SH EXAMPLES
@@ -207,7 +220,6 @@ pkstat_t   *ksp;
 .in -2
 
 .SH SEE ALSO
-.sp
 .LP
 \fBkstat\fR(3KSTAT), \fBddi_get_instance\fR(9F), \fBkstat_delete\fR(9F),
 \fBkstat_install\fR(9F), \fBkstat_named_init\fR(9F), \fBkstat\fR(9S),
diff --git a/usr/src/man/man9f/taskq.9f b/usr/src/man/man9f/taskq.9f
index 1426fb491e..b6017e75a6 100644
--- a/usr/src/man/man9f/taskq.9f
+++ b/usr/src/man/man9f/taskq.9f
@@ -4,7 +4,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH TASKQ 9F "Mar 1, 2005"
+.TH TASKQ 9F "Jul 25, 2015"
 .SH NAME
 taskq, ddi_taskq_create, ddi_taskq_destroy, ddi_taskq_dispatch, ddi_taskq_wait,
 ddi_taskq_suspend, taskq_suspended, ddi_taskq_resume \- Kernel task queue
@@ -50,11 +50,9 @@ operations
 .fi
 
 .SH INTERFACE LEVEL
-.sp
 .LP
 Solaris DDI specific (Solaris DDI)
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIdip\fR\fR
@@ -168,7 +166,6 @@ Pointer to a thread structure.
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
 A kernel task queue is a mechanism for general-purpose asynchronous task
 scheduling that enables tasks to be performed at a later time by another
@@ -187,7 +184,7 @@ You have a task that may require grabbing locks that a thread already holds.
 .RS +4
 .TP
 3.
-You have a task that needs to block (for example, to wait for memory), but a
+You have a task that needs to block (for example, to wait for memory), but you
 have a thread that cannot block in its current context.
 .RE
 .RS +4
@@ -208,9 +205,8 @@ A task queue consists of a list of tasks, together with one or more threads to
 service the list. If a task queue has a single service thread, all tasks are
 guaranteed to execute in the order they were dispatched. Otherwise they can be
 executed in any order. Note that since tasks are placed on a list, execution of
-one task and should not depend on the execution of another task or a deadlock
-may occur. A \fBtaskq\fR created with a single servicing thread guarantees that
-all the tasks are serviced in the order in which they are scheduled.
+one task should not depend on the execution of another task or a deadlock
+may occur.
 .sp
 .LP
 The \fBddi_taskq_create()\fR function creates a task queue instance.
@@ -248,7 +244,6 @@ queue is suspended.
 .LP
 The \fBddi_taskq_resume()\fR function resumes task queue execution.
 .SH RETURN VALUES
-.sp
 .LP
 The \fBddi_taskq_create()\fR function creates an opaque handle that is used for
 all other \fBtaskq\fR operations. It returns a \fBtaskq\fR pointer on success
@@ -262,7 +257,6 @@ dispatch a task and returns \fBDDI_SUCCESS\fR if dispatch succeeded.
 The \fBddi_taskq_suspended()\fR function returns \fBB_TRUE\fR if \fBtaskq\fR is
 suspended. Otherwise \fBB_FALSE\fR is returned.
 .SH CONTEXT
-.sp
 .LP
 All functions may be called from the user or kernel contexts.
 .sp
diff --git a/usr/src/pkg/manifests/system-dtrace-tests.mf b/usr/src/pkg/manifests/system-dtrace-tests.mf
index f7a88b7b1b..ebea059639 100644
--- a/usr/src/pkg/manifests/system-dtrace-tests.mf
+++ b/usr/src/pkg/manifests/system-dtrace-tests.mf
@@ -1573,6 +1573,8 @@ file path=opt/SUNWdtrt/tst/common/scalars/err.D_OP_INCOMPAT.dupltype.d \
 file path=opt/SUNWdtrt/tst/common/scalars/err.D_OP_INCOMPAT.dupttype.d \
     mode=0444
 file path=opt/SUNWdtrt/tst/common/scalars/err.D_SYNTAX.declare.d mode=0444
+file path=opt/SUNWdtrt/tst/common/scalars/err.bigglobal.d mode=0444
+file path=opt/SUNWdtrt/tst/common/scalars/err.biglocal.d mode=0444
 file path=opt/SUNWdtrt/tst/common/scalars/tst.basicvar.d mode=0444
 file path=opt/SUNWdtrt/tst/common/scalars/tst.basicvar.d.out mode=0444
 file path=opt/SUNWdtrt/tst/common/scalars/err.bigglobal.d mode=0444
diff --git a/usr/src/uts/intel/asm/atomic.h b/usr/src/uts/intel/asm/atomic.h
index 29913b6bd5..edbfad9c2c 100644
--- a/usr/src/uts/intel/asm/atomic.h
+++ b/usr/src/uts/intel/asm/atomic.h
@@ -23,6 +23,7 @@
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  * Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright 2015 Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
  */
 
 #ifndef _ASM_ATOMIC_H
@@ -82,7 +83,9 @@ fxn(volatile type *target)						\
 {									\
 	__asm__ __volatile__(						\
 	    "lock; " op " %0"						\
-	    : "+m" (*target));						\
+	    : "+m" (*target)						\
+	    : /* no inputs */						\
+	    : "cc");							\
 }
 
 __ATOMIC_OPXX(atomic_inc_8,      uint8_t,  "inc" SUF_8)
@@ -112,7 +115,8 @@ fxn(volatile type1 *target, type2 delta)				\
 	__asm__ __volatile__(						\
 	    "lock; " op " %1,%0"					\
 	    : "+m" (*target)						\
-	    : "i" reg (delta));						\
+	    : "i" reg (delta)						\
+	    : "cc");							\
 }
 
 __ATOMIC_OPXX(atomic_add_8,     uint8_t,  int8_t,      "add" SUF_8,    "q")
@@ -137,7 +141,8 @@ atomic_add_ptr(volatile void *target, ssize_t delta)
 	__asm__ __volatile__(
 	    "lock; add" SUF_PTR " %1,%0"
 	    : "+m" (*tmp)
-	    : "ir" (delta));
+	    : "ir" (delta)
+	    : "cc");
 }
 
 __ATOMIC_OPXX(atomic_or_8,       uint8_t,  uint8_t,  "or" SUF_8,    "q")