[illumos-gate merge]

commit 739415d128746863863f9005c1923d9f5dd397e4
    8916 man pages should refer to our own Dynamic Tracing Guide
    8915 remove reference to kgmon in lockstat(1m)
commit 435a78cc932ae710cfa076091a136712cf13ccf2
    8885 64-bit libbsm:adt_do_ipv[46]_address creates non-compressible at_port.
commit f6969e9b236c140638ae16b1d5c8dff401e31465
    8848 hbaapi: variable set but not used
commit 4c307623be8d9c2d69ed7e8622a1ab0a6348d0dd
    8843 libnls: variable 'version' set but not used
commit 19700af4088d99a0f173873dcdfcf51fdb90335b
    8830 libshell: variable set but not used
commit 1d6eba5f15dcb03614b687ec6ddaa6477b7baa41
    8823 print: variable 'error' set but not used
commit a1a46df055863a267eb7a80b7961c9379bc457ec
    8822 libsmbfs: variable set but not used
commit 8f33f62fe3b6ef9b5f9a849a5d2081f34e048be2
    8819 x86 unix: variable set but not used
commit ea6a05275c5cbe13e3a79eb7efb3a0a097613149
    8813 rdsv3: variable 'timeo' set but not used
commit 8b9a0f1ef5cee53073074965f0ea1d015d66926f
    8812 xge: variable set but not used
commit a3907569cb648b92b09b4854131a106aafecab36
    8911 loader: move ficl outb and inb into libi386

28 files changed, 241 insertions, 226 deletions

diff --git a/usr/src/boot/sys/boot/i386/libi386/biospci.c b/usr/src/boot/sys/boot/i386/libi386/biospci.c
index e143ba9746..1f9f86338f 100644
--- a/usr/src/boot/sys/boot/i386/libi386/biospci.c
+++ b/usr/src/boot/sys/boot/i386/libi386/biospci.c
@@ -33,6 +33,7 @@
 
 #include <stand.h>
 #include <machine/stdarg.h>
+#include <machine/cpufunc.h>
 #include <bootstrap.h>
 #include <isapnp.h>
 #include <btxv86.h>
@@ -599,3 +600,46 @@ ficlCompilePciBios(ficlSystem *pSys)
 }
 
 FICL_COMPILE_SET(ficlCompilePciBios);
+
+/*
+ * outb ( port# c -- )
+ * Store a byte to I/O port number port#
+ */
+static void
+ficlOutb(ficlVm *pVM)
+{
+	uint8_t c;
+	uint32_t port;
+
+	port = ficlStackPopUnsigned(ficlVmGetDataStack(pVM));
+	c = ficlStackPopInteger(ficlVmGetDataStack(pVM));
+	outb(port, c);
+}
+
+/*
+ * inb ( port# -- c )
+ * Fetch a byte from I/O port number port#
+ */
+static void
+ficlInb(ficlVm *pVM)
+{
+	uint8_t c;
+	uint32_t port;
+
+	port = ficlStackPopUnsigned(ficlVmGetDataStack(pVM));
+	c = inb(port);
+	ficlStackPushInteger(ficlVmGetDataStack(pVM), c);
+}
+
+static void
+ficlCompileCpufunc(ficlSystem *pSys)
+{
+	ficlDictionary *dp = ficlSystemGetDictionary(pSys);
+
+	FICL_SYSTEM_ASSERT(pSys, dp);
+
+	ficlDictionarySetPrimitive(dp, "outb", ficlOutb, FICL_WORD_DEFAULT);
+	ficlDictionarySetPrimitive(dp, "inb", ficlInb, FICL_WORD_DEFAULT);
+}
+
+FICL_COMPILE_SET(ficlCompileCpufunc);
diff --git a/usr/src/common/ficl/loader.c b/usr/src/common/ficl/loader.c
index be642c3b46..d581015c5c 100644
--- a/usr/src/common/ficl/loader.c
+++ b/usr/src/common/ficl/loader.c
@@ -43,9 +43,6 @@
 #include <termios.h>
 #else
 #include <stand.h>
-#ifdef __i386__
-#include <machine/cpufunc.h>
-#endif
 #include "bootstrap.h"
 #endif
 #ifdef _STANDALONE
@@ -852,42 +849,6 @@ fkey(ficlVm *pVM)
 	ficlStackPushInteger(ficlVmGetDataStack(pVM), i > 0 ? ch : -1);
 }
 
-
-#ifdef _STANDALONE
-#ifdef __i386__
-
-/*
- * outb ( port# c -- )
- * Store a byte to I/O port number port#
- */
-void
-ficlOutb(ficlVm *pVM)
-{
-	uint8_t c;
-	uint32_t port;
-
-	port = ficlStackPopUnsigned(ficlVmGetDataStack(pVM));
-	c = ficlStackPopInteger(ficlVmGetDataStack(pVM));
-	outb(port, c);
-}
-
-/*
- * inb ( port# -- c )
- * Fetch a byte from I/O port number port#
- */
-void
-ficlInb(ficlVm *pVM)
-{
-	uint8_t c;
-	uint32_t port;
-
-	port = ficlStackPopUnsigned(ficlVmGetDataStack(pVM));
-	c = inb(port);
-	ficlStackPushInteger(ficlVmGetDataStack(pVM), c);
-}
-#endif
-#endif
-
 /*
  * Retrieves free space remaining on the dictionary
  */
@@ -954,10 +915,6 @@ ficlSystemCompilePlatform(ficlSystem *pSys)
 	ficlDictionarySetPrimitive(dp, "uuid-to-string", ficlUuidToString,
 	    FICL_WORD_DEFAULT);
 #ifdef _STANDALONE
-#ifdef __i386__
-	ficlDictionarySetPrimitive(dp, "outb", ficlOutb, FICL_WORD_DEFAULT);
-	ficlDictionarySetPrimitive(dp, "inb", ficlInb, FICL_WORD_DEFAULT);
-#endif
 	/* Register words from linker set. */
 	SET_FOREACH(fnpp, Xficl_compile_set)
 		(*fnpp)(pSys);
diff --git a/usr/src/common/smbclnt/smbfs_ntacl.c b/usr/src/common/smbclnt/smbfs_ntacl.c
index 6780d891ee..dcc0d55e79 100644
--- a/usr/src/common/smbclnt/smbfs_ntacl.c
+++ b/usr/src/common/smbclnt/smbfs_ntacl.c
@@ -66,16 +66,16 @@
 #define	FREESZ(p, sz) kmem_free(p, sz)
 #else	/* _KERNEL */
 #define	MALLOC(size) malloc(size)
-#ifndef lint
-#define	FREESZ(p, sz) free(p)
-#else	/* lint */
+/*
+ * Define FREESZ() as inline function so the compiler will not
+ * trigger variable set but not used warning for sz in calling function.
+ */
 /* ARGSUSED */
-static void
-FREESZ(void *p, size_t sz)
+static inline void
+FREESZ(void *p, size_t sz __unused)
 {
 	free(p);
 }
-#endif	/* lint */
 #endif	/* _KERNEL */
 
 #define	ERRCHK(expr)	if ((error = expr) != 0) goto errout
diff --git a/usr/src/lib/hbaapi/common/HBAAPILIB.c b/usr/src/lib/hbaapi/common/HBAAPILIB.c
index 9a9c114100..d0e3e31b0e 100644
--- a/usr/src/lib/hbaapi/common/HBAAPILIB.c
+++ b/usr/src/lib/hbaapi/common/HBAAPILIB.c
@@ -515,7 +515,9 @@ HBA_LoadLibrary(void) {
     int			ret;
 #endif
     HBA_STATUS		status;
+#ifdef NOTDEF
     HBA_UINT32		libversion;
+#endif
 
     /* Open configuration file from known location */
 #ifdef WIN32
@@ -633,10 +635,10 @@ HBA_LoadLibrary(void) {
 	    /* ???Opportunity to send error msg, library error? */
 	    goto dud_library;
 	}
+#ifdef NOTDEF /* save for a later time... when it matters */
 	/* Check the version of this library before loading */
 	/* Actually... This wrapper is compatible with version 1 */
 	libversion = ((GetVersionFunc)());
-#ifdef NOTDEF /* save for a later time... when it matters */
 	if (libversion < HBA_LIBVERSION) {
 	    goto dud_library;
 	}
@@ -792,17 +794,17 @@ HBA_LoadLibrary(void) {
 	   == NULL) {
 	    continue;
 	}
+#ifdef NOTDEF /* save for a later time... when it matters */
 	libversion = ((GetVersionFunc)());
 	/* Check the version of this library before loading */
 	/* Actually... This wrapper is compatible with version 1 */
-#ifdef NOTDEF /* save for a later time... when it matters */
 	if(libversion < HBA_LIBVERSION) {
 	    printf("Library version mismatch. Got %d expected %d.\n",
 		   libversion, HBA_LIBVERSION);
 	    continue;
 	}
-#endif
 	DEBUG(1, "%s libversion = %d", librarypath, libversion, 0);
+#endif
 	LoadLibraryFunc = lib_infop->functionTable.LoadLibraryHandler;
 	if (LoadLibraryFunc == NULL) {
 	    /* this function is required */
@@ -874,7 +876,6 @@ HBA_LoadLibrary(void) {
 HBA_STATUS
 HBA_FreeLibrary(void) {
     HBAFreeLibraryFunc	FreeLibraryFunc;
-    HBA_STATUS		status;
     HBA_LIBRARY_INFO	*lib_infop;
     HBA_LIBRARY_INFO	*lib_next;
     HBA_ADAPTERCALLBACK_ELEM
@@ -893,7 +894,7 @@ HBA_FreeLibrary(void) {
 	    FreeLibraryFunc = lib_infop->functionTable.FreeLibraryHandler;
 	    if (FreeLibraryFunc != NULL) {
 		/* Free this library */
-		status = ((FreeLibraryFunc)());
+		(void)((FreeLibraryFunc)());
 	    }
 #ifdef WIN32
 	    FreeLibrary(lib_infop->hLibrary);	/* Unload DLL from memory */
diff --git a/usr/src/lib/libbsm/common/adt.c b/usr/src/lib/libbsm/common/adt.c
index 4cf0dd7566..20741efa75 100644
--- a/usr/src/lib/libbsm/common/adt.c
+++ b/usr/src/lib/libbsm/common/adt.c
@@ -22,6 +22,7 @@
 /*
  * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2013, Joyent, Inc. All rights reserved.
+ * Copyright 2017 OmniOS Community Edition (OmniOSce) Association.
  */
 
 #include <bsm/adt.h>
@@ -589,12 +590,42 @@ adt_set_mask(const adt_session_data_t *session_data, const au_mask_t *mask)
  * helpers for adt_load_termid
  */
 
+static dev_t
+adt_ports_to_at_port(in_port_t remote, in_port_t local)
+{
+	dev_t port;
+
+#ifdef _LP64
+	dev_t tmp;
+
+	/*
+	 * In 64-bit, at_port is a 64-bit value encoding major/minor
+	 * device numbers as 32-bits each. However when a 32-bit application
+	 * subsequently requests the audit address via getaudit_addr(), this
+	 * value must be capable of being compressed down to a 14-bit major and
+	 * 18-bit minor number or the call will fail.
+	 *
+	 * In order to construct a 32-bit compatible value, the top 14-bits of
+	 * the remote port are used for the major number and the remaining
+	 * 2-bits + local port are used for the minor.
+	 */
+
+	tmp = ((remote<<16) | (local));
+	port = (tmp & MAXMIN32);
+	port |= (((tmp >> NBITSMINOR32) & MAXMAJ32) << NBITSMINOR64);
+#else
+	port = ((remote<<16) | (local));
+#endif
+
+	return (port);
+}
+
 static void
 adt_do_ipv6_address(struct sockaddr_in6 *peer, struct sockaddr_in6 *sock,
     au_tid_addr_t *termid)
 {
-
-	termid->at_port = ((peer->sin6_port<<16) | (sock->sin6_port));
+	termid->at_port =
+	    adt_ports_to_at_port(peer->sin6_port, sock->sin6_port);
 	termid->at_type = AU_IPv6;
 	(void) memcpy(termid->at_addr, &peer->sin6_addr, 4 * sizeof (uint_t));
 }
@@ -603,9 +634,7 @@ static void
 adt_do_ipv4_address(struct sockaddr_in *peer, struct sockaddr_in *sock,
     au_tid_addr_t *termid)
 {
-
-	termid->at_port = ((peer->sin_port<<16) | (sock->sin_port));
-
+	termid->at_port = adt_ports_to_at_port(peer->sin_port, sock->sin_port);
 	termid->at_type = AU_IPv4;
 	termid->at_addr[0] = (uint32_t)peer->sin_addr.s_addr;
 	(void) memset(&(termid->at_addr[1]), 0, 3 * sizeof (uint_t));
diff --git a/usr/src/lib/libnls/common/nlsrequest.c b/usr/src/lib/libnls/common/nlsrequest.c
index 547aeff2f2..b7965646d5 100644
--- a/usr/src/lib/libnls/common/nlsrequest.c
+++ b/usr/src/lib/libnls/common/nlsrequest.c
@@ -22,9 +22,6 @@
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-
-#ident	"%Z%%M%	%I%	%E% SMI"        /* SVr4.0 1.5.1.1	*/
-
 /*
  *
  * nlsrequest(3):
@@ -67,7 +64,7 @@ nlsrequest(int fd, char *svc_code)
 	int	len, err, flags;
 	char 	buf[256];
 	char	*p;
-	int	version, ret;
+	int	ret;
 	extern  int t_errno;
 
 	t_errno = 0;		/* indicates a 'name' problem	*/
@@ -79,55 +76,68 @@ nlsrequest(int fd, char *svc_code)
 
 	if (!svc_code || !strlen(svc_code) ||
 	    (strlen(svc_code) >= (size_t)SVC_CODE_SZ)) {
-		if (_nlslog)
-			fprintf(stderr, "nlsrequest: invalid service code format\n");
-		return(-1);
+		if (_nlslog) {
+			fprintf(stderr,
+			    "nlsrequest: invalid service code format\n");
+		}
+		return (-1);
 	}
 
 	/*
 	 * send protocol message requesting the service
 	 */
 
-	len = sprintf(buf, nls_v2_msg, svc_code)+1;/* inc trailing null */
+	len = sprintf(buf, nls_v2_msg, svc_code) + 1; /* inc trailing null */
 
 	if (t_snd(fd, buf, len, 0) < len) {
 		if (_nlslog)
 			t_error("t_snd of listener request message failed");
-		return(-1);
+		return (-1);
 	}
 
 	p = _nlsbuf;
 	len = 0;
 
 	do {
-		if (++len > sizeof(_nlsbuf)) {
-			if (_nlslog)
-				fprintf(stderr, "nlsrequest: _nlsbuf not large enough\n");
-			return(-1);
+		if (++len > sizeof (_nlsbuf)) {
+			if (_nlslog) {
+				fprintf(stderr,
+				    "nlsrequest: _nlsbuf not large enough\n");
+			}
+			return (-1);
 		}
-		if (t_rcv(fd, p, sizeof(char), &flags) != sizeof(char)) {
-			if (_nlslog)
-				t_error("t_rcv of listener response msg failed");
-			return(-1);
+		if (t_rcv(fd, p, sizeof (char), &flags) != sizeof (char)) {
+			if (_nlslog) {
+				t_error("t_rcv of listener response msg "
+				    "failed");
+			}
+			return (-1);
 		}
 
 	} while (*p++ != '\0');
 
 
-	if ((p = strtok(_nlsbuf, ":")) == (char *)0)
+	if ((p = strtok(_nlsbuf, ":")) == NULL)
 		goto parsefail;
-	version = atoi(p);
 
-	if ((p = strtok((char *)0, ":")) == (char *)0)
+	/*
+	 * We ignore the version number here as we do not have any use for it.
+	 * Previous versions of the code looked at it by calling atoi() on it,
+	 * which did not mutate the actual string and did not use it.
+	 */
+
+	if ((p = strtok(NULL, ":")) ==  NULL)
 		goto parsefail;
 	ret = atoi(p);
 	_nlsrmsg = p + strlen(p) + 1;
 	if (ret && _nlslog)
 		fprintf(stderr, "%s\n", _nlsrmsg); /* debug only */
-	return(ret);
+	return (ret);
 
 parsefail:
-	if (_nlslog)
-		fprintf(stderr, "nlsrequest: failed parse of response message\n");
-	return(-1);
+	if (_nlslog) {
+		fprintf(stderr,
+		    "nlsrequest: failed parse of response message\n");
+	}
+	return (-1);
 }
diff --git a/usr/src/lib/libshell/common/bltins/misc.c b/usr/src/lib/libshell/common/bltins/misc.c
index 237a4448ee..04066e1a29 100644
--- a/usr/src/lib/libshell/common/bltins/misc.c
+++ b/usr/src/lib/libshell/common/bltins/misc.c
@@ -57,7 +57,8 @@ struct login
 	char    *arg0;
 };
 
-int    b_exec(int argc,char *argv[], void *extra)
+int
+b_exec(int argc __unused, char *argv[], void *extra)
 {
 	struct login logdata;
 	register int n;
diff --git a/usr/src/lib/libshell/common/sh/parse.c b/usr/src/lib/libshell/common/sh/parse.c
index 28d52ac769..35aca3f496 100644
--- a/usr/src/lib/libshell/common/sh/parse.c
+++ b/usr/src/lib/libshell/common/sh/parse.c
@@ -1285,7 +1285,7 @@ static Shnode_t *simple(Lex_t *lexp,int flag, struct ionod *io)
 	struct argnod	**argtail;
 	struct argnod	**settail;
 	int	cmdarg=0;
-	int	argno = 0, argmax=0;
+	int	argno = 0;
 	int	assignment = 0;
 	int	key_on = (!(flag&SH_NOIO) && sh_isoption(SH_KEYWORD));
 	int	associative=0;
@@ -1347,8 +1347,6 @@ static Shnode_t *simple(Lex_t *lexp,int flag, struct ionod *io)
 		{
 			if(!(argp->argflag&ARG_RAW))
 			{
-				if(argno>0)
-					argmax = argno;
 				argno = -1;
 			}
 			if(argno>=0 && argno++==cmdarg && !(flag&SH_ARRAY) && *argp->argval!='/')
@@ -1388,7 +1386,6 @@ static Shnode_t *simple(Lex_t *lexp,int flag, struct ionod *io)
 		if((tok==IPROCSYM || tok==OPROCSYM))
 		{
 			argp = process_sub(lexp,tok);
-			argmax = 0;
 			argno = -1;
 			*argtail = argp;
 			argtail = &(argp->argnxt.ap);
@@ -1445,8 +1442,6 @@ static Shnode_t *simple(Lex_t *lexp,int flag, struct ionod *io)
 		}
 	}
 	*argtail = 0;
-	if(argno>0)
-		argmax = argno;
 	t->comtyp = TCOM;
 #if SHOPT_KIA
 	if(lexp->kiafile && !(flag&SH_NOIO))
diff --git a/usr/src/lib/libshell/common/sh/xec.c b/usr/src/lib/libshell/common/sh/xec.c
index e6ba69dd74..afceb6a355 100644
--- a/usr/src/lib/libshell/common/sh/xec.c
+++ b/usr/src/lib/libshell/common/sh/xec.c
@@ -2977,7 +2977,7 @@ static pid_t sh_ntfork(Shell_t *shp,const Shnode_t *t,char *argv[],int *jobid,in
 {
 	static pid_t	spawnpid;
 	static int	savetype;
-	static int	savejobid;
+	static int	savejobid __unused;
 	struct checkpt	buff;
 	int		otype=0, jmpval;
 	volatile int	jobwasset=0, scope=0, sigwasset=0;
diff --git a/usr/src/lib/print/libpapi-dynamic/common/psm.c b/usr/src/lib/print/libpapi-dynamic/common/psm.c
index af31f24b4e..a928de0991 100644
--- a/usr/src/lib/print/libpapi-dynamic/common/psm.c
+++ b/usr/src/lib/print/libpapi-dynamic/common/psm.c
@@ -27,8 +27,6 @@
 
 /* $Id: psm.c 146 2006-03-24 00:26:54Z njacobs $ */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
@@ -63,7 +61,7 @@ psm_open(service_t *svc, char *scheme)
 			result = PAPI_NOT_POSSIBLE;
 #ifdef DEBUG
 		detailed_error(svc, "psm_open(%s): %s: %s", scheme, path,
-				dlerror());
+		    dlerror());
 #endif
 	}
 
@@ -79,12 +77,19 @@ psm_close(void *handle)
 void *
 psm_sym(service_t *svc, char *name)
 {
+#ifdef DEBUG
 	char *error = "invalid input";
+#endif
 	void *func = NULL;
 
 	if ((svc != NULL) && (svc->so_handle != NULL) && (name != NULL)) {
-		if ((func = dlsym(svc->so_handle, name)) == NULL)
+		if ((func = dlsym(svc->so_handle, name)) == NULL) {
+#ifdef DEBUG
 			error = dlerror();
+#else
+			return (func);
+#endif
+		}
 	}
 #ifdef DEBUG
 	if (func == NULL)
diff --git a/usr/src/man/man1m/dtrace.1m b/usr/src/man/man1m/dtrace.1m
index fc71612e0f..2a51cbaa68 100644
--- a/usr/src/man/man1m/dtrace.1m
+++ b/usr/src/man/man1m/dtrace.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 DTRACE 1M "Aug 4, 2009"
+.TH DTRACE 1M "Dec 10, 2017"
 .SH NAME
 dtrace \- DTrace dynamic tracing compiler and tracing utility
 .SH SYNOPSIS
@@ -21,15 +21,14 @@ dtrace \- DTrace dynamic tracing compiler and tracing utility
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
-DTrace is a comprehensive dynamic tracing framework for the Solaris Operating
-System. DTrace provides a powerful infrastructure that permits administrators,
+DTrace is a comprehensive dynamic tracing framework.
+DTrace provides a powerful infrastructure that permits administrators,
 developers, and service personnel to concisely answer arbitrary questions about
 the behavior of the operating system and user programs.
 .sp
 .LP
-The \fISolaris Dynamic Tracing Guide\fR describes how to use DTrace to observe,
+The \fIDynamic Tracing Guide\fR describes how to use DTrace to observe,
 debug, and tune system behavior. Refer to this book for a detailed description
 of DTrace features, including the bundled DTrace observability tools,
 instrumentation providers, and the D programming language.
@@ -82,10 +81,9 @@ You can use \fBdtrace\fR to create D scripts by using it in a \fB#!\fR
 declaration to create an interpreter file. You can also use \fBdtrace\fR to
 attempt to compile D programs and determine their properties without actually
 enabling tracing using the \fB-e\fR option. See \fBOPTIONS\fR. See the
-\fISolaris Dynamic Tracing Guide\fR for detailed examples of how to use the
+\fIDynamic Tracing Guide\fR for detailed examples of how to use the
 \fBdtrace\fR utility to perform these tasks.
 .SH OPTIONS
-.sp
 .LP
 The arguments accepted by the \fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, and
 \fB-i\fR options can include an optional D language \fIpredicate\fR enclosed in
@@ -125,7 +123,7 @@ format (ELF32 or ELF64) produced by the \fB-G\fR option.
 Claim anonymous tracing state and display the traced data. You can combine the
 \fB-a\fR option with the \fB-e\fR option to force \fBdtrace\fR to exit
 immediately after consuming the anonymous tracing state rather than continuing
-to wait for new data. See the \fISolaris Dynamic Tracing Guide\fR for more
+to wait for new data. See the \fIDynamic Tracing Guide\fR for more
 information about anonymous tracing.
 .RE
 
@@ -169,7 +167,7 @@ one \fB-c\fR option is present on the command line, \fBdtrace\fR exits when all
 commands have exited, reporting the exit status for each child process as it
 terminates. The process-ID of the first command is made available to any D
 programs specified on the command line or using the \fB-s\fR option through the
-\fB$target\fR macro variable. Refer to the \fISolaris Dynamic Tracing Guide\fR
+\fB$target\fR macro variable. Refer to the \fIDynamic Tracing Guide\fR
 for more information on macro variables.
 .RE
 
@@ -393,7 +391,7 @@ specified on the command line at a time.
 .ad
 .sp .6
 .RS 4n
-Specify the \fIoutput\fR file for the \fB-A\fR , \fB-G\fR,  \fB-h\fR, and
+Specify the \fIoutput\fR file for the \fB-A\fR, \fB-G\fR, \fB-h\fR, and
 \fB-l\fR options, or for the traced data itself. If the \fB-A\fR option is
 present and \fB-o\fR is not present, the default output file is
 \fB/kernel/drv/dtrace.conf\fR. If the \fB-G\fR option is present and the
@@ -414,8 +412,8 @@ its completion. If more than one \fB-p\fR option is present on the command
 line, \fBdtrace\fR exits when all commands have exited, reporting the exit
 status for each process as it terminates. The first process-ID is made
 available to any D programs specified on the command line or using the \fB-s\fR
-option through the \fB$target\fR macro variable. Refer to the \fISolaris
-Dynamic Tracing Guide\fR for more information on macro variables.
+option through the \fB$target\fR macro variable. Refer to the \fIDynamic
+Tracing Guide\fR for more information on macro variables.
 .RE
 
 .sp
@@ -494,7 +492,7 @@ invocation.
 Set verbose mode. If the \fB-v\fR option is specified, \fBdtrace\fR produces a
 program stability report showing the minimum interface stability and dependency
 level for the specified D programs. DTrace stability levels are explained in
-further detail in the \fISolaris Dynamic Tracing Guide\fR.
+further detail in the \fIDynamic Tracing Guide\fR.
 .RE
 
 .sp
@@ -506,7 +504,7 @@ further detail in the \fISolaris Dynamic Tracing Guide\fR.
 .RS 4n
 Report the highest D programming interface version supported by \fBdtrace\fR.
 The version information is printed to \fBstdout\fR and the \fBdtrace\fR command
-exits. Refer to the \fISolaris Dynamic Tracing Guide\fR for more information
+exits. Refer to the \fIDynamic Tracing Guide\fR for more information
 about DTrace versioning features.
 .RE
 
@@ -531,7 +529,7 @@ enabling of a D program that contains destructive actions.
 .sp .6
 .RS 4n
 Enable or modify a DTrace runtime option or D compiler option. The list of
-options is found in the \fISolaris Dynamic Tracing Guide\fR. Boolean options
+options is found in the \fIDynamic Tracing Guide\fR. Boolean options
 are enabled by specifying their name. Options with values are set by separating
 the option name and value with an equals sign (\fB=\fR).
 .RE
@@ -662,7 +660,7 @@ definitions are always specified and valid in all modes:
 .sp
 Where \fIMM\fR is the major release value in hexadecimal, \fImmm\fR is the
 minor release value in hexadecimal, and \fIuuu\fR is the micro release value in
-hexadecimal. Refer to the \fISolaris Dynamic Tracing Guide\fR for more
+hexadecimal. Refer to the \fIDynamic Tracing Guide\fR for more
 information about DTrace versioning.
 .RE
 .RE
@@ -682,15 +680,13 @@ descriptions that do not match any known probes.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 You can specify zero or more additional arguments on the \fBdtrace\fR command
 line to define a set of macro variables (\fB$1\fR, \fB$2\fR, and so forth). The
 additional arguments can be used in D programs specified using the \fB-s\fR
 option or on the command line. The use of macro variables is described further
-in the \fISolaris Dynamic Tracing Guide\fR.
+in the \fIDynamic Tracing Guide\fR.
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -729,7 +725,6 @@ Invalid command line options or arguments were specified.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -748,19 +743,21 @@ Interface Stability	See below.
 .LP
 The command-line syntax is Committed. The human-readable output is Uncommitted.
 .SH SEE ALSO
-.sp
 .LP
 \fBcpp\fR(1), \fBisainfo\fR(1), \fBssh\fR(1), \fBlibdtrace\fR(3LIB),
 \fBdriver.conf\fR(4), \fBattributes\fR(5), \fBdtrace\fR(7D)
 .sp
 .LP
-\fISolaris Dynamic Tracing Guide\fR
-.SH USAGE
+\fIDynamic Tracing Guide\fR:
 .sp
 .LP
+https://illumos.org/books/dtrace/
+
+.SH NOTES
+.LP
 When using the \fB-p\fR flag, \fBdtrace\fR stops the target processes while it
 is inspecting them and reporting results. A process can do nothing while it is
-stopped. This means that, if , for example, the X server is inspected by
+stopped. This means that, if, for example, the X server is inspected by
 \fBdtrace\fR running in a window under the X server's control, the whole window
 system can become deadlocked, because the \fBproc\fR tool would be attempting
 to display its results to a window that cannot be refreshed. In such a case,
diff --git a/usr/src/man/man1m/intrstat.1m b/usr/src/man/man1m/intrstat.1m
index 35494f2d47..600628f12c 100644
--- a/usr/src/man/man1m/intrstat.1m
+++ b/usr/src/man/man1m/intrstat.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 INTRSTAT 1M "Jun 16, 2009"
+.TH INTRSTAT 1M "Dec 10, 2017"
 .SH NAME
 intrstat \- report interrupt statistics
 .SH SYNOPSIS
@@ -14,7 +14,6 @@ intrstat \- report interrupt statistics
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBintrstat\fR utility gathers and displays run-time interrupt statistics.
 The output is a table of device names and CPU IDs, where each row of the table
@@ -50,11 +49,10 @@ while \fBintrstat\fR is running are not displayed.
 .sp
 .LP
 \fBintrstat\fR induces a small system-wide performance degradation. As a
-result, only the super-user can run \fBintrstat\fR by default. The \fISolaris
-Dynamic Tracing Guide\fR explains how administrators can grant privileges to
+result, only the super-user can run \fBintrstat\fR by default. The
+\fIDynamic Tracing Guide\fR explains how administrators can grant privileges to
 other users to permit them to run \fBintrstat\fR.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -110,13 +108,12 @@ time. See \fBtime\fR(2). Specify \fBd\fR for standard date format. See
 .sp .6
 .RS 4n
 Enable or modify a DTrace runtime option or D compiler option. The list of
-options is found in the \fISolaris Dynamic Tracing Guide\fR. A boolean option
+options is found in the \fIDynamic Tracing Guide\fR. A boolean option
 is enabled by specifying its name. Options with values are set by separating
 the option name and value with an equal sign (\fB=\fR)
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -182,7 +179,6 @@ example# intrstat
 .sp
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -201,10 +197,12 @@ Interface Stability	See below.
 .LP
 The command-line syntax is Evolving. The human-readable output is Unstable.
 .SH SEE ALSO
-.sp
 .LP
 \fBdtrace\fR(1M), \fBtrapstat\fR(1M), \fBattributes\fR(5), \fBIntro\fR(7),
 \fBddi_driver_name\fR(9F)
 .sp
 .LP
-\fISolaris Dynamic Tracing Guide\fR
+\fIDynamic Tracing Guide\fR:
+.sp
+.LP
+https://illumos.org/books/dtrace/
diff --git a/usr/src/man/man1m/lockstat.1m b/usr/src/man/man1m/lockstat.1m
index 8c7eb17494..a6798ed849 100644
--- a/usr/src/man/man1m/lockstat.1m
+++ b/usr/src/man/man1m/lockstat.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 LOCKSTAT 1M "Feb 28, 2008"
+.TH LOCKSTAT 1M "Dec 10, 2017"
 .SH NAME
 lockstat \- report kernel lock and profiling statistics
 .SH SYNOPSIS
@@ -17,7 +17,6 @@ lockstat \- report kernel lock and profiling statistics
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBlockstat\fR utility gathers and displays kernel locking and profiling
 statistics. \fBlockstat\fR allows you to specify which events to watch (for
@@ -49,14 +48,12 @@ applicable.
 intercept events of interest. This imposes a small but measurable overhead on
 all system activity, so access to \fBlockstat\fR is restricted to super-user by
 default. The system administrator can permit other users to use \fBlockstat\fR
-by granting them additional DTrace privileges. Refer to the \fISolaris Dynamic
+by granting them additional DTrace privileges. Refer to the \fIDynamic
 Tracing Guide\fR for more information about DTrace security features.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .SS "Event Selection"
-.sp
 .LP
 If no event selection options are specified, the default is \fB-C\fR.
 .sp
@@ -134,7 +131,6 @@ Hz).
 .RE
 
 .SS "Data Gathering"
-.sp
 .ne 2
 .na
 \fB\fB-x\fR \fIarg\fR[=\fIval\fR]\fR
@@ -148,7 +144,6 @@ an equals sign (=).
 .RE
 
 .SS "Data Gathering (Mutually Exclusive)"
-.sp
 .ne 2
 .na
 \fB\fB-b\fR\fR
@@ -189,7 +184,6 @@ Timing: Basic plus timing for all events [default].
 .RE
 
 .SS "Data Filtering"
-.sp
 .ne 2
 .na
 \fB\fB\fR\fB-d\fR \fIduration\fR\fR
@@ -244,7 +238,6 @@ Trace (rather than sample) events [off by default].
 .RE
 
 .SS "Data Reporting"
-.sp
 .ne 2
 .na
 \fB\fB-c\fR\fR
@@ -353,7 +346,6 @@ Wherever: distinguish events only by lock, not by caller.
 .RE
 
 .SH DISPLAY FORMATS
-.sp
 .LP
 The following headers appear over various columns of data.
 .sp
@@ -836,24 +828,22 @@ Count indv cuml rcnt     nsec CPU+PIL          Caller
 .sp
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdtrace\fR(1M), \fBplockstat\fR(1M), \fBattributes\fR(5), \fBlockstat\fR(7D),
 \fBmutex\fR(9F), \fBrwlock\fR(9F)
 .sp
 .LP
-\fISolaris Dynamic Tracing Guide\fR
-.SH NOTES
+\fIDynamic Tracing Guide\fR:
 .sp
 .LP
-The profiling support provided by \fBlockstat\fR \fB-I\fR replaces the old (and
-undocumented) \fB/usr/bin/kgmon\fR and \fB/dev/profile\fR.
-.sp
+https://illumos.org/books/dtrace/
+
+.SH NOTES
 .LP
 Tail-call elimination can affect call sites. For example, if
 \fBfoo()\fR\fB+0x50\fR calls \fBbar()\fR and the last thing \fBbar()\fR does is
 call \fBmutex_exit()\fR, the compiler can arrange for \fBbar()\fR to branch to
-\fBmutex_exit()\fRwith a return address of \fBfoo()\fR\fB+0x58\fR. Thus, the
+\fBmutex_exit()\fR with a return address of \fBfoo()\fR\fB+0x58\fR. Thus, the
 \fBmutex_exit()\fR in \fBbar()\fR will appear as though it occurred at
 \fBfoo()\fR\fB+0x58\fR.
 .sp
@@ -869,5 +859,5 @@ asynchronously, not by a function call from that \fBPC\fR.
 .sp
 .LP
 The \fBlockstat\fR technology is provided on an as-is basis. The format and
-content of \fBlockstat\fR output reflect the current Solaris kernel
+content of \fBlockstat\fR output reflect the current kernel
 implementation and are therefore subject to change in future releases.
diff --git a/usr/src/man/man1m/plockstat.1m b/usr/src/man/man1m/plockstat.1m
index b24f36d67d..d1dca3ce03 100644
--- a/usr/src/man/man1m/plockstat.1m
+++ b/usr/src/man/man1m/plockstat.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 PLOCKSTAT 1M "Jan 26, 2009"
+.TH PLOCKSTAT 1M "Dec 10, 2017"
 .SH NAME
 plockstat \- report user-level lock statistics
 .SH SYNOPSIS
@@ -20,7 +20,6 @@ plockstat \- report user-level lock statistics
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBplockstat\fR utility gathers and displays user-level locking statistics.
 By default, \fBplockstat\fR monitors all lock contention events, gathers
@@ -39,7 +38,6 @@ performance overhead on the processes being observed. Users must have the
 with \fBplockstat\fR. Refer to the \fI\fR for more information about DTrace
 security features.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -121,7 +119,7 @@ Print out a message to indicate that tracing has started.
 .ad
 .RS 16n
 Enable or modify a DTrace runtime option or D compiler option. The list of
-options is found in the \fISolaris Dynamic Tracing Guide\fR. Boolean options
+options is found in the \fIDynamic Tracing Guide\fR. Boolean options
 are enabled by specifying their name. Options with values are set by separating
 the option name and value with an equals sign (\fB=\fR).
 .RE
@@ -137,7 +135,6 @@ directly with the \fBdtrace\fR(1M) command.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -186,7 +183,6 @@ Duration specified as a positive integer number of seconds.
 .RE
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -208,7 +204,6 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -227,7 +222,6 @@ Interface Stability	See below.
 .LP
 The command-line syntax is Evolving. The human-readable output is Unstable.
 .SH SEE ALSO
-.sp
 .LP
 \fBdtrace\fR(1M), \fBlockstat\fR(1M), \fBmutex_init\fR(3C),
 \fBpthread_mutex_lock\fR(3C), \fBpthread_rwlock_rdlock\fR(3C),
@@ -235,4 +229,7 @@ The command-line syntax is Evolving. The human-readable output is Unstable.
 \fBrwlock\fR(3C), \fBattributes\fR(5), \fBfasttrap\fR(7D)
 .sp
 .LP
-\fI\fR
+\fIDynamic Tracing Guide\fR:
+.sp
+.LP
+https://illumos.org/books/dtrace/
diff --git a/usr/src/man/man3lib/libdtrace.3lib b/usr/src/man/man3lib/libdtrace.3lib
index 8930957b41..5d212a1313 100644
--- a/usr/src/man/man3lib/libdtrace.3lib
+++ b/usr/src/man/man3lib/libdtrace.3lib
@@ -3,26 +3,23 @@
 .\" 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 LIBDTRACE 3LIB "Sep 17, 2003"
+.TH LIBDTRACE 3LIB "Dec 10, 2017"
 .SH NAME
 libdtrace \- DTrace dynamic tracing software library
 .SH DESCRIPTION
-.sp
 .LP
 Functions in this library define the interface for interacting with the DTrace
 dynamic tracing software, including the D language compiler and facilities for
 enabling probes and consuming trace data.
 .SH INTERFACES
-.sp
 .LP
 The interfaces provided by libdtrace.so.1 are currently private to the
-implementation of the Solaris system and DTrace subsystem and are subject to
+implementation of the illumos system and DTrace subsystem and are subject to
 change at any time without notice.  Applications using these interfaces might
-fail to run on future releases. Refer to the \fISolaris Dynamic Tracing
+fail to run on future releases. Refer to the \fIDynamic Tracing
 Guide\fR for a description of the public documented interfaces available for
 the DTrace facility.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/usr/lib/libdtrace.so.1\fR\fR
@@ -41,7 +38,6 @@ shared object
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -58,9 +54,11 @@ MT-Level	Unsafe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdtrace\fR(1M), \fBattributes\fR(5), \fBdtrace\fR(7D)
 .sp
 .LP
-\fISolaris Dynamic Tracing Guide\fR
+\fIDynamic Tracing Guide\fR:
+.sp
+.LP
+https://illumos.org/books/dtrace/
diff --git a/usr/src/man/man7d/dtrace.7d b/usr/src/man/man7d/dtrace.7d
index 9d7b427ea8..cefee6a2cd 100644
--- a/usr/src/man/man7d/dtrace.7d
+++ b/usr/src/man/man7d/dtrace.7d
@@ -3,21 +3,19 @@
 .\" 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 DTRACE 7D "Sep 4, 2003"
+.TH DTRACE 7D "Dec 10, 2017"
 .SH NAME
 dtrace \- DTrace dynamic tracing facility
 .SH DESCRIPTION
-.sp
 .LP
 The \fBdtrace\fR driver provides the dynamic instrumentation and tracing
 facilities for the DTrace software, as well as the built-in \fBdtrace\fR
 provider. The \fBdtrace\fR driver is not a public interface and you access the
 instrumentation offered by this provider through DTrace tools such as
-\fBdtrace\fR(1M).  Refer to the \fISolaris Dynamic Tracing Guide\fR for a
+\fBdtrace\fR(1M).  Refer to the \fIDynamic Tracing Guide\fR for a
 description of the public documented interfaces available for the DTrace
 facility and dtrace provider probes.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for a description of the following attributes:
 .sp
@@ -33,9 +31,11 @@ Interface Stability 	Private
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdtrace\fR(1M), \fBlibdtrace\fR(3LIB), \fBattributes\fR(5)
 .sp
 .LP
-\fISolaris Dynamic Tracing Guide\fR
+\fIDynamic Tracing Guide\fR:
+.sp
+.LP
+https://illumos.org/books/dtrace/
diff --git a/usr/src/man/man7d/fasttrap.7d b/usr/src/man/man7d/fasttrap.7d
index c2ed44f936..63a1335e25 100644
--- a/usr/src/man/man7d/fasttrap.7d
+++ b/usr/src/man/man7d/fasttrap.7d
@@ -3,37 +3,34 @@
 .\" 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 FASTTRAP 7D "Sep 4, 2003"
+.TH FASTTRAP 7D "Dec 10, 2017"
 .SH NAME
 fasttrap \- DTrace user instruction tracing provider
 .SH DESCRIPTION
-.sp
 .LP
 The \fBfasttrap\fR driver is a DTrace dynamic tracing provider that performs
-dynamic instrumentation of arbitrary instructions in Solaris processes. The
+dynamic instrumentation of arbitrary instructions in illumos processes. The
 \fBfasttrap\fR driver implements the DTrace \fBfasttrap\fR and \fBpid\fR
 providers.
 .sp
 .LP
 The \fBfasttrap\fR driver is not a public interface and you access
 instrumentation offered by this provider through DTrace. Refer to the
-\fISolaris Dynamic Tracing Guide\fR for a description of the public documented
+\fIDynamic Tracing Guide\fR for a description of the public documented
 interfaces available for the DTrace facility and the probes offered by the
 \fBfasttrap\fR provider.
 .SH SPARC ONLY
-.sp
 .LP
 The \fBfasttrap\fR provider provides a DTrace probe that fires each time a user
 process executes an instruction. The \fBpid\fR provider allows for the dynamic
 creation of DTrace probes corresponding to instruction locations inside any
 user process specified using a process ID and an instruction address or symbol
 name. Together these providers permit DTrace users to perform instrumentation
-of Solaris user processes and to trace the interactions between processes and
+of user processes and to trace the interactions between processes and
 the operating system. See the chapter entitled "User Process Tracing"  in the
-\fISolaris Dynamic Tracing Guide\fR for information on how to use these
+\fIDynamic Tracing Guide\fR for information on how to use these
 providers to instrument processes.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for a description of the following attributes:
 .sp
@@ -49,9 +46,11 @@ Interface Stability	Private
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdtrace\fR(1M), \fBattributes\fR(5), \fBdtrace\fR(7D)
 .sp
 .LP
-\fISolaris Dynamic Tracing Guide\fR
+\fIDynamic Tracing Guide\fR:
+.sp
+.LP
+https://illumos.org/books/dtrace/
diff --git a/usr/src/man/man7d/fbt.7d b/usr/src/man/man7d/fbt.7d
index 0c2700bf6a..3b62aa3392 100644
--- a/usr/src/man/man7d/fbt.7d
+++ b/usr/src/man/man7d/fbt.7d
@@ -3,14 +3,13 @@
 .\" 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 FBT 7D "Sep 4, 2003"
+.TH FBT 7D "Dec 10, 2017"
 .SH NAME
 fbt \- DTrace function boundary tracing provider
 .SH DESCRIPTION
-.sp
 .LP
 The \fBfbt\fR driver is a DTrace dynamic tracing provider that performs dynamic
-instrumentation at function boundaries in the Solaris kernel.
+instrumentation at function boundaries in the kernel.
 .sp
 .LP
 The function is the fundamental unit of program text. In a well-designed
@@ -25,11 +24,10 @@ offering the instrumentation as a set of DTrace probes.
 .LP
 The \fBfbt\fR driver is not a public interface and you access the
 instrumentation offered by this provider through DTrace. Refer to the
-\fISolaris Dynamic Tracing Guide\fR for a description of the public documented
+\fIDynamic Tracing Guide\fR for a description of the public documented
 interfaces available for the DTrace facility and the probes offered by the
 \fBfbt\fR provider.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for a description of the following attributes:
 .sp
@@ -45,9 +43,11 @@ Interface Stability	Private
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdtrace\fR(1M), \fBattributes\fR(5), \fBdtrace\fR(7D)
 .sp
 .LP
-\fISolaris Dynamic Tracing Guide\fR
+\fIDynamic Tracing Guide\fR:
+.sp
+.LP
+https://illumos.org/books/dtrace/
diff --git a/usr/src/man/man7d/lockstat.7d b/usr/src/man/man7d/lockstat.7d
index 3c333dc7c2..8bd748536f 100644
--- a/usr/src/man/man7d/lockstat.7d
+++ b/usr/src/man/man7d/lockstat.7d
@@ -3,14 +3,13 @@
 .\" 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 LOCKSTAT 7D "Sep 3, 2003"
+.TH LOCKSTAT 7D "Dec 10, 2017"
 .SH NAME
 lockstat \- DTrace kernel lock instrumentation provider
 .SH DESCRIPTION
-.sp
 .LP
 The \fBlockstat\fR driver is a DTrace dynamic tracing provider that performs
-dynamic instrumentation for locking primitives in the Solaris kernel.
+dynamic instrumentation for locking primitives in the kernel.
 .sp
 .LP
 The \fBlockstat\fR provider makes probes available that you can use to discern
@@ -22,11 +21,10 @@ data.
 .LP
 The \fBlockstat\fR driver is not a public interface and you access the
 instrumentation offered by this provider through DTrace. Refer to the
-\fISolaris Dynamic Tracing Guide\fR for a description of the public documented
+\fIDynamic Tracing Guide\fR for a description of the public documented
 interfaces available for the DTrace facility and the probes offered by the
 \fBlockstat\fR provider.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for a description of the following attributes:
 .sp
@@ -42,9 +40,11 @@ Interface Stability 	Private
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdtrace\fR(1M), \fBlockstat\fR(1M), \fBattributes\fR(5), \fBdtrace\fR(7D)
 .sp
 .LP
-\fISolaris Dynamic Tracing Guide\fR
+\fIDynamic Tracing Guide\fR:
+.sp
+.LP
+https://illumos.org/books/dtrace/
diff --git a/usr/src/man/man7d/profile.7d b/usr/src/man/man7d/profile.7d
index b2d59580e5..26f6722179 100644
--- a/usr/src/man/man7d/profile.7d
+++ b/usr/src/man/man7d/profile.7d
@@ -3,11 +3,10 @@
 .\" 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 PROFILE 7D "Sep 4, 2003"
+.TH PROFILE 7D "Dec 10, 2017"
 .SH NAME
 profile \- DTrace profile interrupt provider
 .SH DESCRIPTION
-.sp
 .LP
 The \fBprofile\fR driver is a DTrace dynamic tracing provider that adds
 time-based interrupt event sources that can be used as DTrace probes.
@@ -26,11 +25,10 @@ fires.
 .LP
 The \fBprofile\fR driver is not a public interface and you access the
 instrumentation offered by this provider through DTrace. Refer to the
-\fISolaris Dynamic Tracing Guide\fR for a description of the public documented
+\fIDynamic Tracing Guide\fR for a description of the public documented
 interfaces available for the DTrace facility and the probes offered by the
 profile provider.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for a description of the following attributes:
 .sp
@@ -46,9 +44,11 @@ Interface Stability	Private
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdtrace\fR(1M), \fBattributes\fR(5), \fBdtrace\fR(7D)
 .sp
 .LP
-\fISolaris Dynamic Tracing Guide\fR
+\fIDynamic Tracing Guide\fR:
+.sp
+.LP
+https://illumos.org/books/dtrace/
diff --git a/usr/src/man/man7d/sdt.7d b/usr/src/man/man7d/sdt.7d
index 3fd2c7f03e..f42b6885a9 100644
--- a/usr/src/man/man7d/sdt.7d
+++ b/usr/src/man/man7d/sdt.7d
@@ -3,14 +3,13 @@
 .\" 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 SDT 7D "Sep 4, 2003"
+.TH SDT 7D "Dec 10, 2017"
 .SH NAME
 sdt \- DTrace statically defined tracing provider
 .SH DESCRIPTION
-.sp
 .LP
 The \fBsdt\fR driver is a DTrace dynamic tracing provider that performs dynamic
-instrumentation at statically-defined locations in the Solaris kernel.
+instrumentation at statically-defined locations in the kernel.
 .sp
 .LP
 The \fBsdt\fR provider allows kernel developers to explicitly create probes at
@@ -21,12 +20,11 @@ that point with the choice of probe name and a relevant set of arguments.
 .sp
 .LP
 The \fBsdt\fR driver is not a public interface and you access instrumentation
-offered by this provider through DTrace. Refer to the \fISolaris Dynamic
+offered by this provider through DTrace. Refer to the \fIDynamic
 Tracing Guide\fR for a description of the public documented interfaces
 available for the DTrace facility and the probes offered by the \fBsdt\fR
 provider.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for a description of the following attributes:
 .sp
@@ -42,9 +40,11 @@ Interface Stability 	Private
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdtrace\fR(1M), \fBattributes\fR(5), \fBdtrace\fR(7D)
 .sp
 .LP
-\fISolaris Dynamic Tracing Guide\fR
+\fIDynamic Tracing Guide\fR:
+.sp
+.LP
+https://illumos.org/books/dtrace/
diff --git a/usr/src/man/man7d/systrace.7d b/usr/src/man/man7d/systrace.7d
index b7fc81fcdb..aab1fa03fd 100644
--- a/usr/src/man/man7d/systrace.7d
+++ b/usr/src/man/man7d/systrace.7d
@@ -3,11 +3,10 @@
 .\" 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 SYSTRACE 7D "Sep 4, 2003"
+.TH SYSTRACE 7D "Dec 10, 2017"
 .SH NAME
 systrace \- DTrace system call tracing provider
 .SH DESCRIPTION
-.sp
 .LP
 The \fBsystrace\fR driver implements the DTrace \fBsyscall\fR dynamic tracing
 provider. The syscall provider performs dynamic instrumentation to offer probes
@@ -17,11 +16,10 @@ point.
 .LP
 The \fBsystrace\fR driver is not a public interface and you access the
 instrumentation offered by this provider through DTrace. Refer to the
-\fISolaris Dynamic Tracing Guide\fR for a description of the public documented
+\fIDynamic Tracing Guide\fR for a description of the public documented
 interfaces available for the DTrace facility and the probes offered by the
 \fBsyscall\fR provider.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for a description of the following attributes:
 .sp
@@ -37,9 +35,11 @@ Interface Stability	Private
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBdtrace\fR(1M), \fBattributes\fR(5), \fBdtrace\fR(7D)
 .sp
 .LP
-\fISolaris Dynamic Tracing Guide\fR
+\fIDynamic Tracing Guide\fR:
+.sp
+.LP
+https://illumos.org/books/dtrace/
diff --git a/usr/src/uts/common/io/ib/clients/rdsv3/rds_recv.c b/usr/src/uts/common/io/ib/clients/rdsv3/rds_recv.c
index 24b88c94f1..23f559651e 100644
--- a/usr/src/uts/common/io/ib/clients/rdsv3/rds_recv.c
+++ b/usr/src/uts/common/io/ib/clients/rdsv3/rds_recv.c
@@ -457,7 +457,6 @@ rdsv3_recvmsg(struct rdsv3_sock *rs, uio_t *uio,
     struct nmsghdr *msg, size_t size, int msg_flags)
 {
 	struct rsock *sk = rdsv3_rs_to_sk(rs);
-	long timeo;
 	int ret = 0;
 	struct sockaddr_in *sin = NULL;
 	struct rdsv3_incoming *inc = NULL;
@@ -470,9 +469,6 @@ rdsv3_recvmsg(struct rdsv3_sock *rs, uio_t *uio,
 	    (msg_flags & MSG_DONTWAIT))
 		nonblock = B_TRUE;
 
-	/* udp_recvmsg()->sock_recvtimeo() gets away without locking too.. */
-	timeo = rdsv3_rcvtimeo(sk, nonblock);
-
 	if (msg_flags & MSG_OOB)
 		goto out;
 
diff --git a/usr/src/uts/common/io/xge/hal/xgehal/xgehal-channel.c b/usr/src/uts/common/io/xge/hal/xgehal/xgehal-channel.c
index 5c580dc6cb..3bb2cf76a3 100644
--- a/usr/src/uts/common/io/xge/hal/xgehal/xgehal-channel.c
+++ b/usr/src/uts/common/io/xge/hal/xgehal/xgehal-channel.c
@@ -77,7 +77,7 @@ __hal_channel_dtr_next_not_completed(xge_hal_channel_h channelh,
 		xge_hal_dtr_h *dtrh)
 {
 	/* LINTED E_FUNC_SET_NOT_USED */
-	xge_hal_ring_rxd_1_t *rxdp; /* doesn't matter 1, 3 or 5... */
+	xge_hal_ring_rxd_1_t *rxdp __unused; /* doesn't matter 1, 3 or 5... */
 
 	__hal_channel_dtr_try_complete(channelh, dtrh);
 	if (*dtrh == NULL) {
diff --git a/usr/src/uts/common/io/xge/hal/xgehal/xgehal-ring.c b/usr/src/uts/common/io/xge/hal/xgehal/xgehal-ring.c
index c2d5ac5eab..0be48488f2 100644
--- a/usr/src/uts/common/io/xge/hal/xgehal/xgehal-ring.c
+++ b/usr/src/uts/common/io/xge/hal/xgehal/xgehal-ring.c
@@ -76,7 +76,7 @@ __hal_ring_rxdblock_link(xge_hal_mempool_h mempoolh,
 			 xge_hal_ring_t *ring, int from, int to)
 {
 	xge_hal_ring_block_t *to_item, *from_item;
-	dma_addr_t to_dma, from_dma;
+	dma_addr_t to_dma, from_dma __unused;
 	pci_dma_h to_dma_handle, from_dma_handle;
 
 	/* get "from" RxD block */
diff --git a/usr/src/uts/common/vm/vm_pagelist.c b/usr/src/uts/common/vm/vm_pagelist.c
index 216947f665..0f481b423d 100644
--- a/usr/src/uts/common/vm/vm_pagelist.c
+++ b/usr/src/uts/common/vm/vm_pagelist.c
@@ -3427,7 +3427,7 @@ page_geti_contig_pages(int mnode, uint_t bin, uchar_t szc, int flags,
 	page_t *pp, *randpp, *endpp;
 	uint_t colors, ceq_mask;
 	/* LINTED : set but not used in function */
-	uint_t color_mask;
+	uint_t color_mask __unused;
 	pfn_t hi, lo;
 	uint_t skip;
 	MEM_NODE_ITERATOR_DECL(it);
@@ -3730,7 +3730,7 @@ page_chk_freelist(uint_t szc)
 /*ARGSUSED*/
 page_t *
 page_get_freelist(struct vnode *vp, u_offset_t off, struct seg *seg,
-	caddr_t vaddr, size_t size, uint_t flags, struct lgrp *lgrp)
+    caddr_t vaddr, size_t size, uint_t flags, struct lgrp *lgrp)
 {
 	struct as	*as = seg->s_as;
 	page_t		*pp = NULL;
diff --git a/usr/src/uts/i86pc/os/lgrpplat.c b/usr/src/uts/i86pc/os/lgrpplat.c
index 981398970e..7e5bc36295 100644
--- a/usr/src/uts/i86pc/os/lgrpplat.c
+++ b/usr/src/uts/i86pc/os/lgrpplat.c
@@ -3638,7 +3638,7 @@ opt_probe_vendor(int dest_node, int nreads)
 	int		cnt;
 	uint_t		dev;
 	/* LINTED: set but not used in function */
-	volatile uint_t	dev_vendor;
+	volatile uint_t	dev_vendor __unused;
 	hrtime_t	elapsed;
 	hrtime_t	end;
 	int		ipl;
diff --git a/usr/src/uts/i86pc/vm/hat_kdi.c b/usr/src/uts/i86pc/vm/hat_kdi.c
index 7688e651d9..986bcb579e 100644
--- a/usr/src/uts/i86pc/vm/hat_kdi.c
+++ b/usr/src/uts/i86pc/vm/hat_kdi.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * HAT interfaces used by the kernel debugger to interact with the VM system.
  * These interfaces are invoked when the world is stopped.  As such, no blocking
@@ -79,7 +77,7 @@ void
 hat_kdi_init(void)
 {
 	/*LINTED:set but not used in function*/
-	htable_t *ht;
+	htable_t *ht __unused;
 
 	/*
 	 * Get an kernel page VA to use for phys mem access. Then make sure