[illumos-gate merge]

commit 35b5a2ef2c05b7c6ccdf28298cd7c084c454649d
    9798 exec_init() should be able to handle a 64bit init process
commit b5cf5bc277244cdacc06d213322ec98e76ef8d89
    9796 want support for PCI BAR size >= 4G
commit 9f16e2df28efab26216cf68e3841c0a460c5bb73
    9790 buffer freed to wrong cache in virtio_register_intx
commit 58b4950459ba60f94383ffc2a0d53a6c11636200
    9827 clean up some space-tab sequences
commit ea01a15a654b9e1c7b37d958f4d1911882ed7781
    9831 bldenv should adapt to nightly debug settings
commit eabe844ad2e8e98f99faa0fad638b77d3eecc309
    9803 pbchk could use a -c option
    9825 pbchk -b option should be -p

	Conflicts:
	usr/src/uts/intel/io/pci/pci_boot.c
	usr/src/uts/i86pc/os/cpuid.c
	usr/src/uts/common/os/main.c
	usr/src/uts/common/io/virtio/virtio.c
	usr/src/tools/scripts/Makefile

15 files changed, 166 insertions, 146 deletions

diff --git a/usr/src/tools/scripts/Install.1onbld b/usr/src/tools/scripts/Install.1onbld
index f560091427..b2ce79c464 100644
--- a/usr/src/tools/scripts/Install.1onbld
+++ b/usr/src/tools/scripts/Install.1onbld
@@ -21,6 +21,8 @@
 .\"
 .\" CDDL HEADER END
 .\"
+.\" Copyright 2018 Joyent, Inc.
+.\"
 .TH INSTALL 1ONBLD "Jan 14, 2010"
 .SH NAME
 Install \- install a kernel from an ON workspace
@@ -285,7 +287,6 @@ In order to use the most convenient form of
 .BR Install " (``" "Install -t machine:/" "''),"
 you will need to do the following on the target machine:
 .LP
-.br
 .nf
 	(1) add your machine name to the /etc/hosts.equiv file
 .fi
diff --git a/usr/src/tools/scripts/Makefile b/usr/src/tools/scripts/Makefile
index be65637a17..e98068051d 100644
--- a/usr/src/tools/scripts/Makefile
+++ b/usr/src/tools/scripts/Makefile
@@ -22,7 +22,8 @@
 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # Copyright 2010, Richard Lowe
-# Copyright 2017 Joyent, Inc.
+#
+# Copyright 2018 Joyent, Inc.
 
 SHELL=/usr/bin/ksh93
 
@@ -116,9 +117,6 @@ EXCEPTFILES= \
 
 CLEANFILES = $(SHFILES) $(PERLFILES) $(PYFILES) bldenv.1onbld onu.sh
 
-onu.sh:	onu.sh.in
-	$(SED) -e "s:@PYTHON_VERSION@:$(PYTHON_VERSION):g" < onu.sh.in > $@
-
 include ../Makefile.tools
 
 ROOTONBLDSCRIPTLINKS = $(SCRIPTLINKS:%=$(ROOTONBLDBIN)/%)
@@ -135,6 +133,9 @@ $(ROOTONBLDMAN1ONBLDFILES)	:= FILEMODE=	644
 all:	$(SHFILES) $(PERLFILES) $(PERLMODULES) $(PYFILES) \
 	$(MAN1ONBLDFILES) $(MAKEFILES)
 
+onu.sh:	onu.sh.in
+	$(SED) -e "s:@PYTHON_VERSION@:$(PYTHON_VERSION):g" < onu.sh.in > $@
+
 $(ROOTONBLDBIN)/git-nits:
 	$(RM) $(ROOTONBLDBIN)/git-nits
 	$(SYMLINK) git-pbchk $(ROOTONBLDBIN)/git-nits
@@ -165,7 +166,8 @@ bldenv.1onbld: bldenv
 	$(RM) "$@"
 	(set +o errexit ; ksh93 $? --nroff ; true) 2>&1 | \
 	sed -e 's/\.DS/.nf/g;s/\.DE/.fi/' \
-	-e 's/\.TH BLDENV 1/.TH BLDENV 1ONBLD/' \
+	-e 's/\.TH BLDENV 1/.TH BLDENV 1ONBLD "September 4, 2018"/' \
+	-e 's/.OP \([a-z]\) - flag -/.OP \\-\1/g' \
 	-e 's/(1)/(1ONBLD)/' > "$@"
 
 nightly: nightly.sh stdenv.sh
@@ -173,5 +175,10 @@ nightly: nightly.sh stdenv.sh
 	sed -e '/# STDENV_START/ r stdenv.sh' nightly.sh > nightly
 	$(CHMOD) +x "$@"
 
+#
+# Not run by default: bootstrap...
+check:
+	$(ROOTONBLDBINMACH)/mandoc -Tlint -Wwarning $(MAN1ONBLDFILES)
+
 include ../Makefile.targ
 
diff --git a/usr/src/tools/scripts/bldenv.sh b/usr/src/tools/scripts/bldenv.sh
index 76e5d81e58..4bb89be623 100644
--- a/usr/src/tools/scripts/bldenv.sh
+++ b/usr/src/tools/scripts/bldenv.sh
@@ -24,6 +24,7 @@
 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
 # Copyright 2014 Garrett D'Amore <garrett@damore.org>
+# Copyright 2018 Joyent, Inc.
 #
 # Uses supplied "env" file, based on /opt/onbld/etc/env, to set shell variables
 # before spawning a shell for doing a release-style builds interactively
@@ -69,7 +70,8 @@ typeset -r USAGE=$'+
 [c?force the use of csh, regardless of the  value  of $SHELL.]
 [f?invoke csh with the -f (fast-start) option. This option is valid
     only if $SHELL is unset or if it points to csh.]
-[d?set up environment for doing DEBUG builds (default is non-DEBUG)]
+[d?set up environment for doing DEBUG builds. The default is non-DEBUG,
+    unless the -F flag is specified in the nightly file.]
 [t?set up environment to use the tools in usr/src/tools (this is the
     default, use +t to use the tools from /opt/onbld)]
 
@@ -127,21 +129,22 @@ typeset flags=(
 		typeset d=false
 		typeset o=false
 	)
+	typeset d_set=false
+	typeset DF_build=false
 )
 
 typeset progname="$(basename -- "${0}")"
 
 OPTIND=1
-SUFFIX="-nd"
 
-while getopts -a "${progname}" "${USAGE}" OPT ; do 
+while getopts -a "${progname}" "${USAGE}" OPT ; do
     case ${OPT} in
 	  c)	flags.c=true  ;;
 	  +c)	flags.c=false ;;
 	  f)	flags.f=true  ;;
 	  +f)	flags.f=false ;;
-	  d)	flags.d=true  SUFFIX=""    ;;
-	  +d)	flags.d=false SUFFIX="-nd" ;;
+	  d)	flags.d=true ; flags.d_set=true ;;
+	  +d)	flags.d=false ; flags.d_set=true ;;
 	  t)	flags.t=true  ;;
 	  +t)	flags.t=false ;;
 	  \?)	usage ;;
@@ -235,10 +238,18 @@ do
 	case "$FLAG" in
 	  t)	flags.t=true  ;;
 	  +t)	flags.t=false ;;
+	  F)	flags.DF_build=true ;;
 	  *)	;;
 	esac
 done
 
+# DEBUG is a little bit complicated.  First, bldenv -d/+d over-rides
+# the env file.  Otherwise, we'll default to DEBUG iff we are *not*
+# building non-DEBUG bits at all.
+if [ "${flags.d_set}" != "true" ] && "${flags.DF_build}"; then
+	flags.d=true
+fi
+
 POUND_SIGN="#"
 # have we set RELEASE_DATE in our env file?
 if [ -z "$RELEASE_DATE" ]; then
@@ -252,12 +263,14 @@ export DEV_CM RELEASE_DATE POUND_SIGN
 print 'Build type   is  \c'
 if ${flags.d} ; then
 	print 'DEBUG'
+	SUFFIX=""
 	unset RELEASE_BUILD
 	unset EXTRA_OPTIONS
 	unset EXTRA_CFLAGS
 else
 	# default is a non-DEBUG build
 	print 'non-DEBUG'
+	SUFFIX="-nd"
 	export RELEASE_BUILD=
 	unset EXTRA_OPTIONS
 	unset EXTRA_CFLAGS
@@ -266,18 +279,18 @@ fi
 # update build-type variables
 PKGARCHIVE="${PKGARCHIVE}${SUFFIX}"
 
-# 	Set PATH for a build
+#	Set PATH for a build
 PATH="/opt/onbld/bin:/opt/onbld/bin/${MACH}:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/bin:/usr/sbin:/usr/ucb:/usr/etc:/usr/openwin/bin:/usr/sfw/bin:/opt/sfw/bin:."
-if [[ "${SUNWSPRO}" != "" ]]; then 
-	export PATH="${SUNWSPRO}/bin:$PATH" 
-fi 
+if [[ "${SUNWSPRO}" != "" ]]; then
+	export PATH="${SUNWSPRO}/bin:$PATH"
+fi
 
 if [[ -n "${MAKE}" ]]; then
 	if [[ -x "${MAKE}" ]]; then
 		export PATH="$(dirname -- "${MAKE}"):$PATH"
 	else
 		print "\$MAKE (${MAKE}) is not a valid executible"
-		exit 1	
+		exit 1
 	fi
 fi
 
diff --git a/usr/src/tools/scripts/git-pbchk.1onbld b/usr/src/tools/scripts/git-pbchk.1onbld
index 1a05b5b84f..5876caef63 100644
--- a/usr/src/tools/scripts/git-pbchk.1onbld
+++ b/usr/src/tools/scripts/git-pbchk.1onbld
@@ -12,85 +12,72 @@
 .\"
 .\" Copyright 2011 Richard Lowe.
 .\" Copyright 2015 Elysium Digital, L.L.C.
+.\" Copyright 2018 Joyent, Inc.
 .\"
 
-.TH "GIT\-PBCHK" "1ONBLD" "April 23, 2015" "" ""
+.TH "GIT\-PBCHK" "1ONBLD" "September 4, 2018" "" ""
 
 .SH "NAME"
 \fBgit\-pbchk\fR \- nits and pre\-putback checks for git
 
 .SH "SYNOPSIS"
-git\-pbchk [\-b \fIbranch\fR]
+git\-pbchk [\-c \fIcheck\fR] [\-p \fIbranch\fR] [file...]
 
 .P
-git\-nits [\-b \fIbranch\fR]
+git\-nits [\-c \fIcheck\fR] [\-p \fIbranch\fR] [file...]
 
+.SH "OPTIONS"
+
+.TP
+\fB\-c check\fR:
+.IP
+Run the specific \fIcheck\fR, as named below.
+In this mode, individual files can be provided to check.
+.TP
+\fB\-p branch\fR:
+.IP
+Compare the current workspace to the parent \fIbranch\fR for the purposes of generating file and comment lists\.
+.IP
+If this option is not specified an attempt is made to determine this automatically, if the git branch configuration contains this information\.
+.IP
+If no branch is specified and none can be determined automatically \fBorigin/master\fR is used\.
 .SH "DESCRIPTION"
 Check your workspace for common nits and putback\-ending mistakes, a simple set of checks are run over various parts of your workspace and errors encountered are reported, all of which should, generally, be fixed\.
-
 .TP
-Comment format
+Comment format [comchk]
 Check that putback comments follow the prescribed format (only run for pbchk)
-
 .TP
-Copyrights
+Copyrights [copyright]
 Check that each source file contains a copyright notice for the current
 year\. You don't need to fix this if you, the potential new copyright holder, chooses not to
-
 .TP
-C style
+C style [cstyle]
 Check that C source files conform to the Illumos C style rules
-
 .TP
-Header check
+Header check [hdrchk]
 Check that C header files conform to the Illumos header style rules (in addition to the general C rules)
-
 .TP
-Java style
+Java style [jstyle]
 Check that Java source files conform to the Illumos Java style rules (which differ from the traditionally recommended Java style)
-
 .TP
-SCCS Keywords
+SCCS Keywords [keywords]
 Check that no source files contain unexpanded SCCS keywords\. It is possible that this check may false positive on certain inputs\. It is generally obvious when this is the case\.
-
 .IP
 This check does not check for expanded SCCS keywords, though the common \'ident\'\-style lines should be removed regardless of whether they are expanded\.
-
 .TP
-Mapfile check
+Man page check [manlint]
+Check for problems with man pages.
+.TP
+Mapfile check [mapfilechk]
 Check that linker mapfiles contain a comment directing anyone editing to read the directions in \fBusr/lib/README\.mapfiles\fR\.
-
-.SH "OPTIONS"
-
 .TP
-\fB\-b branch\fR:
-
-.IP
-Compare the current workspace to /branch/ for the purposes of generating file and comment lists\.
-
-.IP
-If this option is not specified an attempt is made to determine this automatically, if the git branch configuration contains this information\.
-
-.IP
-If no branch is specified and none can be determined automatically \fBorigin/master\fR is used\.
-
+Whitespace check [wscheck]
+Check for whitespace issues such as mixed tabs/spaces in source files.
 .SH "FILES"
-\fBgit nits\fR and \fBgit pbchk\fR support NOT files of the form used by Cadmium with Mercurial\. These are looked for in \fB$CODEMGR_WS/\.git/\fR and in \fB$CODEMGR_WS/exception_lists/\fR as normal\. The files are named after the check from which they exclude files\.
-
-.IP "\(bu" 4
-\fBcopyright\.NOT\fR: exclude files listed from copyright checking
-
-.IP "\(bu" 4
-\fBcstyle\.NOT\fR: exclude files from the C style check
-
-.IP "\(bu" 4
-\fBhdrchk\.NOT\fR: exclude files from the C header style check
-
-.IP "\(bu" 4
-\fBkeywords\.NOT\fR: exclude files from the SCCS keywords check
-
-.IP "\(bu" 4
-\fBmapfilechk\.NOT\fR: exclude files from the linker mapfile check
+Exception lists can be used to exclude certain files from checking, named after
+the specific check.
+They can be found in \fB$CODEMGR_WS/exception_lists/\fR, or optionally under
+\fB$CODEMGR_WS/\.git/\fR, where they must be suffixed \fB.NOT\fR.
 
 .IP "" 0
 
diff --git a/usr/src/tools/scripts/git-pbchk.py b/usr/src/tools/scripts/git-pbchk.py
index 4a3533156d..2a05473dae 100644
--- a/usr/src/tools/scripts/git-pbchk.py
+++ b/usr/src/tools/scripts/git-pbchk.py
@@ -18,9 +18,9 @@
 # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2008, 2012 Richard Lowe
 # Copyright 2014 Garrett D'Amore <garrett@damore.org>
-# Copyright (c) 2014, Joyent, Inc.
 # Copyright (c) 2015, 2016 by Delphix. All rights reserved.
 # Copyright 2016 Nexenta Systems, Inc.
+# Copyright 2018 Joyent, Inc.
 #
 
 import getopt
@@ -371,29 +371,42 @@ def pbchk(root, parent, paths):
 
 def main(cmd, args):
     parent_branch = None
+    checkname = None
 
     try:
-        opts, args = getopt.getopt(args, 'b:')
+        opts, args = getopt.getopt(args, 'c:p:')
     except getopt.GetoptError, e:
         sys.stderr.write(str(e) + '\n')
-        sys.stderr.write("Usage: %s [-b branch] [path...]\n" % cmd)
+        sys.stderr.write("Usage: %s [-c check] [-p branch] [path...]\n" % cmd)
         sys.exit(1)
 
     for opt, arg in opts:
+        # backwards compatibility
         if opt == '-b':
             parent_branch = arg
+        elif opt == '-c':
+            checkname = arg
+        elif opt == '-p':
+            parent_branch = arg
 
     if not parent_branch:
         parent_branch = git_parent_branch(git_branch())
 
-    func = nits
-    if cmd == 'git-pbchk':
-        func = pbchk
+    if checkname is None:
+        if cmd == 'git-pbchk':
+            checkname= 'pbchk'
+        else:
+            checkname = 'nits'
+
+    if checkname == 'pbchk':
         if args:
             sys.stderr.write("only complete workspaces may be pbchk'd\n");
             sys.exit(1)
-
-    func(git_root(), parent_branch, args)
+        pbchk(git_root(), parent_branch, None)
+    elif checkname == 'nits':
+        nits(git_root(), parent_branch, args)
+    else:
+        run_checks(git_root(), parent_branch, [eval(checkname)], args)
 
 if __name__ == '__main__':
     try:
diff --git a/usr/src/uts/common/io/virtio/virtio.c b/usr/src/uts/common/io/virtio/virtio.c
index 3a61a80fc4..19a66b8f38 100644
--- a/usr/src/uts/common/io/virtio/virtio.c
+++ b/usr/src/uts/common/io/virtio/virtio.c
@@ -985,7 +985,6 @@ virtio_register_intx(struct virtio_softc *sc,
     struct virtio_int_handler vq_handlers[])
 {
 	int vq_handler_count;
-	int config_handler_count = 0;
 	int actual;
 	struct virtio_handler_container *vhc;
 	size_t vhc_sz;
@@ -997,9 +996,6 @@ virtio_register_intx(struct virtio_softc *sc,
 	    vq_handler_count++)
 		;
 
-	if (config_handler != NULL)
-		config_handler_count = 1;
-
 	vhc_sz = sizeof (struct virtio_handler_container) +
 	    sizeof (struct virtio_int_handler) * vq_handler_count;
 	vhc = kmem_zalloc(vhc_sz, KM_SLEEP);
diff --git a/usr/src/uts/common/sys/pci.h b/usr/src/uts/common/sys/pci.h
index 5ed82542c2..66ce71bcc2 100644
--- a/usr/src/uts/common/sys/pci.h
+++ b/usr/src/uts/common/sys/pci.h
@@ -21,7 +21,7 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
- * Copyright 2016 Joyent, Inc.
+ * Copyright 2018 Joyent, Inc.
  */
 
 #ifndef	_SYS_PCI_H
@@ -488,23 +488,23 @@ extern "C" {
 /*
  * Programming interfaces for class 0xC / subclass 0x0 (Firewire)
  */
-#define	PCI_SERIAL_FIRE_WIRE  		0x00	/* IEEE 1394 (Firewire) */
-#define	PCI_SERIAL_FIRE_1394_HCI 	0x10	/* 1394 OpenHCI Host Cntrlr */
+#define	PCI_SERIAL_FIRE_WIRE		0x00	/* IEEE 1394 (Firewire) */
+#define	PCI_SERIAL_FIRE_1394_HCI	0x10	/* 1394 OpenHCI Host Cntrlr */
 
 /*
  * Programming interfaces for class 0xC / subclass 0x3 (USB controller)
  */
-#define	PCI_SERIAL_USB_IF_UHCI 		0x00	/* UHCI Compliant */
-#define	PCI_SERIAL_USB_IF_OHCI 		0x10	/* OHCI Compliant */
-#define	PCI_SERIAL_USB_IF_EHCI 		0x20	/* EHCI Compliant */
-#define	PCI_SERIAL_USB_IF_GENERIC 	0x80	/* no specific HCD */
-#define	PCI_SERIAL_USB_IF_DEVICE 	0xFE	/* not a HCD */
+#define	PCI_SERIAL_USB_IF_UHCI		0x00	/* UHCI Compliant */
+#define	PCI_SERIAL_USB_IF_OHCI		0x10	/* OHCI Compliant */
+#define	PCI_SERIAL_USB_IF_EHCI		0x20	/* EHCI Compliant */
+#define	PCI_SERIAL_USB_IF_GENERIC	0x80	/* no specific HCD */
+#define	PCI_SERIAL_USB_IF_DEVICE	0xFE	/* not a HCD */
 
 /*
  * Programming interfaces for class 0xC / subclass 0x7 (IPMI controller)
  */
-#define	PCI_SERIAL_IPMI_IF_SMIC 	0x0	/* SMIC Interface */
-#define	PCI_SERIAL_IPMI_IF_KBD 		0x1	/* Keyboard Ctrl Style Intfc */
+#define	PCI_SERIAL_IPMI_IF_SMIC		0x0	/* SMIC Interface */
+#define	PCI_SERIAL_IPMI_IF_KBD		0x1	/* Keyboard Ctrl Style Intfc */
 #define	PCI_SERIAL_IPMI_IF_BTI		0x2	/* Block Transfer Interface */
 
 /*
@@ -522,8 +522,8 @@ extern "C" {
 /*
  * Programming interfaces for class 0xD / subclass 0x1 (Consumer IR controller)
  */
-#define	PCI_WIRELESS_IR_CONSUMER 	0x00	/* Consumer IR Controller */
-#define	PCI_WIRELESS_IR_UWB_RC 		0x10	/* UWB Radio Controller */
+#define	PCI_WIRELESS_IR_CONSUMER	0x00	/* Consumer IR Controller */
+#define	PCI_WIRELESS_IR_UWB_RC		0x10	/* UWB Radio Controller */
 
 /*
  * PCI Sub-class codes - base class 0xE (Intelligent I/O controllers)
diff --git a/usr/src/uts/common/sys/pci_impl.h b/usr/src/uts/common/sys/pci_impl.h
index c998accbcb..3bfdef9f4a 100644
--- a/usr/src/uts/common/sys/pci_impl.h
+++ b/usr/src/uts/common/sys/pci_impl.h
@@ -21,6 +21,7 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ * Copyright 2018 Joyent, Inc.
  */
 
 #ifndef _SYS_PCI_IMPL_H
@@ -37,7 +38,7 @@ extern "C" {
 
 /*
  * There are two ways to access the PCI configuration space on X86
- * 	Access method 2 is the older method
+ *	Access method 2 is the older method
  *	Access method 1 is the newer method and is preferred because
  *	  of the problems in trying to lock the configuration space
  *	  for MP machines using method 2.  See PCI Local BUS Specification
@@ -50,7 +51,7 @@ extern "C" {
 #define	PCI_MECHANISM_UNKNOWN		-1
 #define	PCI_MECHANISM_NONE		0
 #if defined(__i386) || defined(__amd64)
-#define	PCI_MECHANISM_1 		1
+#define	PCI_MECHANISM_1			1
 #define	PCI_MECHANISM_2			2
 #else
 #error "Unknown processor type"
@@ -82,7 +83,7 @@ extern "C" {
 #define	PCI_CADDR2(device, indx) \
 		(0xc000 | (((device) & 0xf) <<  8) | (indx))
 
-typedef struct 	pci_acc_cfblk {
+typedef struct	pci_acc_cfblk {
 	uchar_t	c_busnum;		/* bus number */
 	uchar_t c_devnum;		/* device number */
 	uchar_t c_funcnum;		/* function number */
diff --git a/usr/src/uts/i86pc/io/apix/apix.c b/usr/src/uts/i86pc/io/apix/apix.c
index 33ade10c44..2e65435d90 100644
--- a/usr/src/uts/i86pc/io/apix/apix.c
+++ b/usr/src/uts/i86pc/io/apix/apix.c
@@ -646,7 +646,7 @@ apix_send_eoi(void)
  *	Called at the beginning of the interrupt service routine, but unlike
  *	pcplusmp, does not mask interrupts. An EOI is given to the interrupt
  *	controller to enable other HW interrupts but interrupts are still
- * 	masked by the IF flag.
+ *	masked by the IF flag.
  *
  *	Return -1 for spurious interrupts
  *
@@ -2167,10 +2167,10 @@ apix_level_intr_pre_eoi(int irq)
 	if (apix_mul_ioapic_method == APIC_MUL_IOAPIC_IOXAPIC) {
 		/*
 		 * This is a IOxAPIC and there is EOI register:
-		 * 	Change the vector to reserved unused vector, so that
-		 * 	the EOI	from Local APIC won't clear the Remote IRR for
-		 * 	this level trigger interrupt. Instead, we'll manually
-		 * 	clear it in apix_post_hardint() after ISR handling.
+		 *	Change the vector to reserved unused vector, so that
+		 *	the EOI	from Local APIC won't clear the Remote IRR for
+		 *	this level trigger interrupt. Instead, we'll manually
+		 *	clear it in apix_post_hardint() after ISR handling.
 		 */
 		WRITE_IOAPIC_RDT_ENTRY_LOW_DWORD(apic_ix, intin_ix,
 		    (irqp->airq_rdt_entry & (~0xff)) | APIX_RESV_VECTOR);
diff --git a/usr/src/uts/i86pc/io/pcplusmp/apic_common.c b/usr/src/uts/i86pc/io/pcplusmp/apic_common.c
index b57f978f3b..30644ad12a 100644
--- a/usr/src/uts/i86pc/io/pcplusmp/apic_common.c
+++ b/usr/src/uts/i86pc/io/pcplusmp/apic_common.c
@@ -247,13 +247,13 @@ apic_ioapic_method_probe()
 
 	/*
 	 * Set IOAPIC EOI handling method. The priority from low to high is:
-	 * 	1. IOxAPIC: with EOI register
-	 * 	2. IOMMU interrupt mapping
+	 *	1. IOxAPIC: with EOI register
+	 *	2. IOMMU interrupt mapping
 	 *	3. Mask-Before-EOI method for systems without boot
 	 *	interrupt routing, such as systems with only one IOAPIC;
 	 *	NVIDIA CK8-04/MCP55 systems; systems with bridge solution
 	 *	which disables the boot interrupt routing already.
-	 * 	4. Directed EOI
+	 *	4. Directed EOI
 	 */
 	if (apic_io_ver[0] >= 0x20)
 		apix_mul_ioapic_method = APIC_MUL_IOAPIC_IOXAPIC;
@@ -525,7 +525,7 @@ int
 apic_cpu_stop(processorid_t cpun, caddr_t arg)
 {
 	int		rc;
-	cpu_t 		*cp;
+	cpu_t		*cp;
 	extern cpuset_t cpu_ready_set;
 	extern void cpu_idle_intercept_cpu(cpu_t *cp);
 
diff --git a/usr/src/uts/i86pc/os/cpuid.c b/usr/src/uts/i86pc/os/cpuid.c
index ed560c538e..321d2004ef 100644
--- a/usr/src/uts/i86pc/os/cpuid.c
+++ b/usr/src/uts/i86pc/os/cpuid.c
@@ -4188,7 +4188,7 @@ static const char sl3_cache_str[] = "sectored-l3-cache";
 static const char sh_l2_tlb4k_str[] = "shared-l2-tlb-4k";
 
 static const struct cachetab {
-	uint8_t		ct_code;
+	uint8_t	ct_code;
 	uint8_t		ct_assoc;
 	uint16_t	ct_line_size;
 	size_t		ct_size;
diff --git a/usr/src/uts/i86pc/os/trap.c b/usr/src/uts/i86pc/os/trap.c
index 0da153355e..33fe34f116 100644
--- a/usr/src/uts/i86pc/os/trap.c
+++ b/usr/src/uts/i86pc/os/trap.c
@@ -25,10 +25,10 @@
 
 /*	Copyright (c) 1990, 1991 UNIX System Laboratories, Inc. */
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989, 1990 AT&T   */
-/*		All Rights Reserved   				*/
+/*		All Rights Reserved				*/
 /*								*/
-/*	Copyright (c) 1987, 1988 Microsoft Corporation  	*/
-/*		All Rights Reserved   				*/
+/*	Copyright (c) 1987, 1988 Microsoft Corporation		*/
+/*		All Rights Reserved				*/
 /*								*/
 
 /*
@@ -114,24 +114,24 @@ static const char *trap_type_mnemonic[] = {
 };
 
 static const char *trap_type[] = {
-	"Divide error",				/* trap id 0 	*/
+	"Divide error",				/* trap id 0	*/
 	"Debug",				/* trap id 1	*/
 	"NMI interrupt",			/* trap id 2	*/
-	"Breakpoint",				/* trap id 3 	*/
-	"Overflow",				/* trap id 4 	*/
-	"BOUND range exceeded",			/* trap id 5 	*/
-	"Invalid opcode",			/* trap id 6 	*/
-	"Device not available",			/* trap id 7 	*/
-	"Double fault",				/* trap id 8 	*/
-	"Coprocessor segment overrun",		/* trap id 9 	*/
-	"Invalid TSS",				/* trap id 10 	*/
-	"Segment not present",			/* trap id 11 	*/
-	"Stack segment fault",			/* trap id 12 	*/
-	"General protection",			/* trap id 13 	*/
-	"Page fault",				/* trap id 14 	*/
-	"Reserved",				/* trap id 15 	*/
-	"x87 floating point error",		/* trap id 16 	*/
-	"Alignment check",			/* trap id 17 	*/
+	"Breakpoint",				/* trap id 3	*/
+	"Overflow",				/* trap id 4	*/
+	"BOUND range exceeded",			/* trap id 5	*/
+	"Invalid opcode",			/* trap id 6	*/
+	"Device not available",			/* trap id 7	*/
+	"Double fault",				/* trap id 8	*/
+	"Coprocessor segment overrun",		/* trap id 9	*/
+	"Invalid TSS",				/* trap id 10	*/
+	"Segment not present",			/* trap id 11	*/
+	"Stack segment fault",			/* trap id 12	*/
+	"General protection",			/* trap id 13	*/
+	"Page fault",				/* trap id 14	*/
+	"Reserved",				/* trap id 15	*/
+	"x87 floating point error",		/* trap id 16	*/
+	"Alignment check",			/* trap id 17	*/
 	"Machine check",			/* trap id 18	*/
 	"SIMD floating point exception",	/* trap id 19	*/
 };
diff --git a/usr/src/uts/intel/io/pci/pci_boot.c b/usr/src/uts/intel/io/pci/pci_boot.c
index e7d131d25d..d2961338b6 100644
--- a/usr/src/uts/intel/io/pci/pci_boot.c
+++ b/usr/src/uts/intel/io/pci/pci_boot.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2016 Joyent, Inc.
+ * Copyright 2018 Joyent, Inc.
  */
 
 #include <sys/types.h>
@@ -881,9 +881,9 @@ list_is_vga_only(struct memlist *l, enum io_mem io)
 /*
  * Assign valid resources to unconfigured pci(e) bridges. We are trying
  * to reprogram the bridge when its
- * 		i)   SECBUS == SUBBUS	||
- * 		ii)  IOBASE > IOLIM	||
- * 		iii) MEMBASE > MEMLIM
+ *		i)   SECBUS == SUBBUS	||
+ *		ii)  IOBASE > IOLIM	||
+ *		iii) MEMBASE > MEMLIM
  * This must be done after one full pass through the PCI tree to collect
  * all BIOS-configured resources, so that we know what resources are
  * free and available to assign to the unconfigured PPBs.
@@ -1364,11 +1364,11 @@ pci_reprogram(void)
 		 * 3. Exclude <1M address range here in case below reserved
 		 * ranges for BIOS data area, ROM area etc are wrongly reported
 		 * in ACPI resource producer entries for PCI root bus.
-		 * 	00000000 - 000003FF	RAM
-		 * 	00000400 - 000004FF	BIOS data area
-		 * 	00000500 - 0009FFFF	RAM
-		 * 	000A0000 - 000BFFFF	VGA RAM
-		 * 	000C0000 - 000FFFFF	ROM area
+		 *	00000000 - 000003FF	RAM
+		 *	00000400 - 000004FF	BIOS data area
+		 *	00000500 - 0009FFFF	RAM
+		 *	000A0000 - 000BFFFF	VGA RAM
+		 *	000C0000 - 000FFFFF	ROM area
 		 */
 		(void) memlist_remove(&pci_bus_res[bus].mem_avail, 0, 0x100000);
 		(void) memlist_remove(&pci_bus_res[bus].pmem_avail,
@@ -2537,7 +2537,8 @@ add_reg_props(dev_info_t *dip, uchar_t bus, uchar_t dev, uchar_t func,
 			if ((base & PCI_BASE_TYPE_M) == PCI_BASE_TYPE_ALL) {
 				bar_sz = PCI_BAR_SZ_64;
 				base_hi = pci_getl(bus, dev, func, offset + 4);
-				pci_putl(bus, dev, func, offset + 4, 0xffffffff);
+				pci_putl(bus, dev, func, offset + 4,
+				    0xffffffff);
 				value |= (uint64_t)pci_getl(bus, dev, func,
 				    offset + 4) << 32;
 				pci_putl(bus, dev, func, offset + 4, base_hi);
diff --git a/usr/src/uts/intel/io/pci/pci_pci.c b/usr/src/uts/intel/io/pci/pci_pci.c
index 5d781e40b6..eeb62a82ac 100644
--- a/usr/src/uts/intel/io/pci/pci_pci.c
+++ b/usr/src/uts/intel/io/pci/pci_pci.c
@@ -24,6 +24,7 @@
  */
 /*
  * Copyright 2012 Garrett D'Amore <garrett@damore.org>.  All rights reserved.
+ * Copyright 2018 Joyent, Inc.
  */
 
 /*
@@ -111,15 +112,15 @@ struct bus_ops ppb_bus_ops = {
 	0,			/* (*bus_remove_eventcall)();	*/
 	0,			/* (*bus_post_event)();		*/
 	0,			/* (*bus_intr_ctl)();		*/
-	0,			/* (*bus_config)(); 		*/
-	0,			/* (*bus_unconfig)(); 		*/
-	ppb_fm_init,		/* (*bus_fm_init)(); 		*/
-	NULL,			/* (*bus_fm_fini)(); 		*/
-	NULL,			/* (*bus_fm_access_enter)(); 	*/
-	NULL,			/* (*bus_fm_access_exit)(); 	*/
-	NULL,			/* (*bus_power)(); 	*/
-	ppb_intr_ops,		/* (*bus_intr_op)(); 		*/
-	pcie_hp_common_ops	/* (*bus_hp_op)(); 		*/
+	0,			/* (*bus_config)();		*/
+	0,			/* (*bus_unconfig)();		*/
+	ppb_fm_init,		/* (*bus_fm_init)();		*/
+	NULL,			/* (*bus_fm_fini)();		*/
+	NULL,			/* (*bus_fm_access_enter)();	*/
+	NULL,			/* (*bus_fm_access_exit)();	*/
+	NULL,			/* (*bus_power)();	*/
+	ppb_intr_ops,		/* (*bus_intr_op)();		*/
+	pcie_hp_common_ops	/* (*bus_hp_op)();		*/
 };
 
 /*
@@ -448,7 +449,7 @@ ppb_detach(dev_info_t *devi, ddi_detach_cmd_t cmd)
 /*ARGSUSED*/
 static int
 ppb_bus_map(dev_info_t *dip, dev_info_t *rdip, ddi_map_req_t *mp,
-	off_t offset, off_t len, caddr_t *vaddrp)
+    off_t offset, off_t len, caddr_t *vaddrp)
 {
 	dev_info_t *pdip;
 	ppb_devstate_t *ppb = ddi_get_soft_state(ppb_state,
@@ -471,7 +472,7 @@ ppb_bus_map(dev_info_t *dip, dev_info_t *rdip, ddi_map_req_t *mp,
 /*ARGSUSED*/
 static int
 ppb_ctlops(dev_info_t *dip, dev_info_t *rdip,
-	ddi_ctl_enum_t ctlop, void *arg, void *result)
+    ddi_ctl_enum_t ctlop, void *arg, void *result)
 {
 	pci_regspec_t *drv_regp;
 	int	reglen;
@@ -988,7 +989,7 @@ ppb_close(dev_t dev, int flags, int otyp, cred_t *credp)
 /* ARGSUSED */
 static int
 ppb_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *credp,
-	int *rvalp)
+    int *rvalp)
 {
 	int		instance = PCI_MINOR_NUM_TO_INSTANCE(getminor(dev));
 	ppb_devstate_t	*ppb_p = ddi_get_soft_state(ppb_state, instance);
diff --git a/usr/src/uts/intel/sys/x86_archext.h b/usr/src/uts/intel/sys/x86_archext.h
index 35c28be3f8..7d56044830 100644
--- a/usr/src/uts/intel/sys/x86_archext.h
+++ b/usr/src/uts/intel/sys/x86_archext.h
@@ -90,7 +90,7 @@ extern "C" {
  */
 
 #define	CPUID_INTC_ECX_SSE3	0x00000001	/* Yet more SSE extensions */
-#define	CPUID_INTC_ECX_PCLMULQDQ 0x00000002 	/* PCLMULQDQ insn */
+#define	CPUID_INTC_ECX_PCLMULQDQ 0x00000002	/* PCLMULQDQ insn */
 #define	CPUID_INTC_ECX_DTES64	0x00000004	/* 64-bit DS area */
 #define	CPUID_INTC_ECX_MON	0x00000008	/* MONITOR/MWAIT */
 #define	CPUID_INTC_ECX_DSCPL	0x00000010	/* CPL-qualified debug store */
@@ -323,10 +323,10 @@ extern "C" {
 #define	MSR_PRP4_LBSTK_FROM_5	0x685
 #define	MSR_PRP4_LBSTK_FROM_6	0x686
 #define	MSR_PRP4_LBSTK_FROM_7	0x687
-#define	MSR_PRP4_LBSTK_FROM_8 	0x688
+#define	MSR_PRP4_LBSTK_FROM_8	0x688
 #define	MSR_PRP4_LBSTK_FROM_9	0x689
 #define	MSR_PRP4_LBSTK_FROM_10	0x68a
-#define	MSR_PRP4_LBSTK_FROM_11 	0x68b
+#define	MSR_PRP4_LBSTK_FROM_11	0x68b
 #define	MSR_PRP4_LBSTK_FROM_12	0x68c
 #define	MSR_PRP4_LBSTK_FROM_13	0x68d
 #define	MSR_PRP4_LBSTK_FROM_14	0x68e
@@ -340,7 +340,7 @@ extern "C" {
 #define	MSR_PRP4_LBSTK_TO_6	0x6c6
 #define	MSR_PRP4_LBSTK_TO_7	0x6c7
 #define	MSR_PRP4_LBSTK_TO_8	0x6c8
-#define	MSR_PRP4_LBSTK_TO_9 	0x6c9
+#define	MSR_PRP4_LBSTK_TO_9	0x6c9
 #define	MSR_PRP4_LBSTK_TO_10	0x6ca
 #define	MSR_PRP4_LBSTK_TO_11	0x6cb
 #define	MSR_PRP4_LBSTK_TO_12	0x6cc