[illumos-gate merge]

commit c653bb4713ca694c2d16b04b65d5b76c0bb46bd4 10197 build smatch in parallel commit 15c07adc1c7b828006b5e3c4d528b92229d6bd23 10081 smatch indenting fixes for usr/src/uts commit 5661bb7641e85c46713da7a3002b29ecd2c3daf0 10080 smatch Makefile changes for usr/src/cmd commit 05ede3db5e3b7d540afbccdc872c735770e82ef3 10079 smatch Makefile changes for usr/src/lib commit cadd68ea0014761eda6a293664086dfa80686d85 10078 smatch fixes for UCB commit 1ea94c756c0bc9170021d7b570944a24f224c03f 10202 loader: use screen-#rows to find bottom left co-ordinates commit 08487eea68a2fa501b5042131c6db068089f82e1 10173 loader: support newer ZFS versions Conflicts: usr/src/lib/libdladm/Makefile.com usr/src/lib/fm/topo/modules/i86pc/chip/Makefile
author: Jerry Jelinek <jerry.jelinek@joyent.com> 2019-01-15 13:04:31 +0000
committer: Jerry Jelinek <jerry.jelinek@joyent.com> 2019-01-15 13:04:31 +0000
commit: 7a34fde236609b18147eb73e6a163e19162d96e2 (patch)
tree: 11d647767f5036bbcccee110ad13891ed603a972
parent: 0de99a4637b946f1cd1c7d9fb5949112e1afb82f (diff)
parent: c653bb4713ca694c2d16b04b65d5b76c0bb46bd4 (diff)
download: illumos-joyent-7a34fde236609b18147eb73e6a163e19162d96e2.tar.gz
546 files changed, 2443 insertions, 576 deletions
diff --git a/usr/src/boot/Makefile.version b/usr/src/boot/Makefile.version
index 0f8ec264e4..e360c5912a 100644
--- a/usr/src/boot/Makefile.version
+++ b/usr/src/boot/Makefile.version
@@ -33,4 +33,4 @@ LOADER_VERSION = 1.1
 # Use date like formatting here, YYYY.MM.DD.XX, without leading zeroes.
 # The version is processed from left to right, the version number can only
 # be increased.
-BOOT_VERSION = $(LOADER_VERSION)-2019.01.08.1
+BOOT_VERSION = $(LOADER_VERSION)-2019.01.09.1
diff --git a/usr/src/boot/sys/boot/forth/check-password.4th b/usr/src/boot/sys/boot/forth/check-password.4th
index 58d69cd689..f8b7d5a135 100644
--- a/usr/src/boot/sys/boot/forth/check-password.4th
+++ b/usr/src/boot/sys/boot/forth/check-password.4th
@@ -1,6 +1,7 @@
 \ Copyright (c) 2006-2015 Devin Teske <dteske@FreeBSD.org>
+\ Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 \ All rights reserved.
-\ 
+\
 \ Redistribution and use in source and binary forms, with or without
 \ modification, are permitted provided that the following conditions
 \ are met:
@@ -9,7 +10,7 @@
 \ 2. Redistributions in binary form must reproduce the above copyright
 \    notice, this list of conditions and the following disclaimer in the
 \    documentation and/or other materials provided with the distribution.
-\ 
+\
 \ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 \ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 \ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -21,8 +22,6 @@
 \ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ SUCH DAMAGE.
-\ 
-\ $FreeBSD$
 
 marker task-check-password.4th
 
@@ -49,7 +48,7 @@ variable readlen             \ input length
 \ this is to pass 0 as a stack parameter (ie. `0 sgetkey'). This function is
 \ called by the read function. You need not call it directly. NOTE: arrow keys
 \ show as 0 on the stack
-\ 
+\
 : sgetkey ( -- )
 
 	begin \ Loop forever
@@ -68,7 +67,7 @@ variable readlen             \ input length
 				dup 3 = if ( 4 ) ." |" else
 					1 spaces
 				then then then then drop
-				read-start @ 25 at-xy
+				read-start @ sr at-xy
 				exit
 			then then
 
@@ -94,7 +93,7 @@ variable readlen             \ input length
 
 : read ( c-addr/u -- ) \ Expects string prompt as stack input
 
-	0 25 at-xy           \ Move the cursor to the bottom-left
+	at-bl                \ Move the cursor to the bottom-left
 	dup 1+ read-start !  \ Store X offset after the prompt
 	0 readlen !          \ Initialize the read length
 	type                 \ Print the prompt
@@ -113,12 +112,12 @@ variable readlen             \ input length
 			10 emit  \ Echo new line
 			exit
 		else dup ctrl_u = if
-			3 spaces read-start @ 25 at-xy \ Erase the twiddle
+			3 spaces read-start @ sr at-xy \ Erase the twiddle
 			0 readlen ! \ Reset input to NULL
 		else dup bs_key = if
 			readlen @ 1 - dup readlen ! \ Decrement input length
 			dup 0< if drop 0 dup readlen ! then \ Don't go negative
-			0= if 3 spaces read-start @ 25 at-xy then \ Twiddle
+			0= if 3 spaces read-start @ sr at-xy then \ Twiddle
 		else dup \ Store the character
 			\ NB: sgetkey prevents overflow by way of blocking
 			\     at readmax except for Backspace or Enter
diff --git a/usr/src/boot/sys/boot/forth/menu.4th b/usr/src/boot/sys/boot/forth/menu.4th
index 02e9c90954..efdd51b6a8 100644
--- a/usr/src/boot/sys/boot/forth/menu.4th
+++ b/usr/src/boot/sys/boot/forth/menu.4th
@@ -1,8 +1,9 @@
 \ Copyright (c) 2003 Scott Long <scottl@FreeBSD.org>
 \ Copyright (c) 2003 Aleksander Fafula <alex@fafula.com>
 \ Copyright (c) 2006-2015 Devin Teske <dteske@FreeBSD.org>
+\ Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 \ All rights reserved.
-\ 
+\
 \ Redistribution and use in source and binary forms, with or without
 \ modification, are permitted provided that the following conditions
 \ are met:
@@ -11,7 +12,7 @@
 \ 2. Redistributions in binary form must reproduce the above copyright
 \    notice, this list of conditions and the following disclaimer in the
 \    documentation and/or other materials provided with the distribution.
-\ 
+\
 \ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 \ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 \ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -23,8 +24,6 @@
 \ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ SUCH DAMAGE.
-\ 
-\ $FreeBSD$
 
 marker task-menu.4th
 
@@ -204,7 +203,7 @@ also menu-infrastructure definitions
 \ increments the cursor position to the next row for the creation of the next
 \ menu item. This function is called by the menu-create function. You need not
 \ call it directly.
-\ 
+\
 : printmenuitem ( menu_item_str -- ascii_keycode )
 
 	loader_color? if [char] ^ escc! then
@@ -256,7 +255,7 @@ also menu-infrastructure definitions
 \ display which kernel to boot when the [overloaded] `boot' word is interpreted.
 \ Used internally by menu-create, you need not (nor should you) call this
 \ directly.
-\ 
+\
 : parse-kernels ( N -- ) \ kernidx
 	kernidx ! ( n -- )	\ store provided `x' value
 	[char] 0 kernmenuidx !	\ initialize `y' value for menu_caption[x][y]
@@ -393,7 +392,7 @@ also menu-infrastructure definitions
 \ This function goes through the kernels that were discovered by the
 \ parse-kernels function [above], adding " (# of #)" text to the end of each
 \ caption.
-\ 
+\
 : tag-kernels ( -- )
 	kernidx @ ( -- x ) dup 0= if exit then
 	[char] 0 s"  (Y of Z)" ( x -- x y c-addr/u )
@@ -482,7 +481,7 @@ also menu-infrastructure definitions
 
 \ This function creates the list of menu items. This function is called by the
 \ menu-display function. You need not call it directly.
-\ 
+\
 : menu-create ( -- )
 
 	\ Print the frame caption at (x,y)
@@ -506,12 +505,12 @@ also menu-infrastructure definitions
 	if ( use default center alignement? )
 		menuX @ 19 + over 2 / - menuY @ 1-
 	then
-	at-xy type 
+	at-xy type
 
 	\ If $menu_init is set, evaluate it (allowing for whole menus to be
 	\ constructed dynamically -- as this function could conceivably set
 	\ the remaining environment variables to construct the menu entirely).
-	\ 
+	\
 	s" menu_init" getenv dup -1 <> if
 		evaluate
 	else
@@ -529,13 +528,13 @@ also menu-infrastructure definitions
 	\ and the key required to activate that menu item will be the decimal
 	\ ASCII of 48 plus the menu item (ie. 58 for the tenth item, aka. `:')
 	\ which is misleading and not desirable.
-	\ 
+	\
 	\ Thus, we do not allow more than 8 configurable items on the menu
 	\ (with "Reboot" as the optional ninth and highest numbered item).
 
-	\ 
+	\
 	\ Initialize the OsConsole option status.
-	\ 
+	\
 	0 menuosconsole !
 	s" menu_osconsole" getenv -1 <> if
 		c@ dup 48 > over 57 < and if ( '1' <= c1 <= '8' )
@@ -569,9 +568,9 @@ also menu-infrastructure definitions
 		drop
 	then
 
-	\ 
+	\
 	\ Initialize the ACPI option status.
-	\ 
+	\
 	0 menuacpi !
 	s" menu_acpi" getenv -1 <> if
 		c@ dup 48 > over 57 < and if ( '1' <= c1 <= '8' )
@@ -605,9 +604,9 @@ also menu-infrastructure definitions
 		drop
 	then
 
-	\ 
+	\
 	\ Initialize kernel captions after parsing $kernels
-	\ 
+	\
 	0 menukernel !
 	s" menu_kernel" getenv -1 <> if
 		c@ dup 48 > over 57 < and if ( '1' <= c1 <= '8' )
@@ -646,9 +645,9 @@ also menu-infrastructure definitions
 		drop
 	then
 
-	\ 
+	\
 	\ Initialize the menu_options visual separator.
-	\ 
+	\
 	0 menuoptions !
 	s" menu_options" getenv -1 <> if
 		c@ dup 48 > over 57 < and if ( '1' <= c1 <= '8' )
@@ -742,7 +741,7 @@ also menu-infrastructure definitions
 \ Takes a single integer on the stack and updates the timeout display. The
 \ integer must be between 0 and 9 (we will only update a single digit in the
 \ source message).
-\ 
+\
 : menu-timeout-update ( N -- )
 
 	\ Enforce minimum/maximum
@@ -763,7 +762,7 @@ also menu-infrastructure definitions
 		2drop ( n c-addr -- )
 	then
 
-	0 25 at-xy ( position cursor back at bottom-left )
+	at-bl
 ;
 
 \ This function blocks program flow (loops forever) until a key is pressed.
@@ -772,7 +771,7 @@ also menu-infrastructure definitions
 \ function. You need not call it directly.
 \ note, the esc sequences will be dropped, this needs to be changed if
 \ menu is built based on arrow keys.
-\ 
+\
 : getkey ( -- ascii_keycode )
 
 	begin \ loop forever
@@ -903,7 +902,7 @@ also menu-command-helpers definitions
 			ansi_caption[x]
 		else
 			menu_caption[x]
-		then	
+		then
 		getenv dup -1 <> if
 
 			2 pick ( n c-addr/u -- n c-addr/u n )
@@ -1033,13 +1032,13 @@ also menu-command-helpers definitions
 
 	\ At this point, we should have the following on the stack (in order,
 	\ from bottom to top):
-	\ 
+	\
 	\    n        - Ascii numeral representing the menu choice (inherited)
 	\    addr     - address of our internal cycle_stateN variable
 	\    k        - zero-based number we intend to store to the above
 	\    c-addr/u - string value we intend to store to menu_caption[x]
 	\               (or ansi_caption[x] with loader_color enabled)
-	\ 
+	\
 	\ Let's perform what we need to with the above.
 
 	\ Assign array value text to menu caption
@@ -1058,7 +1057,7 @@ only forth definitions also menu-infrastructure
 
 \ Erase and redraw the menu. Useful if you change a caption and want to
 \ update the menu to reflect the new value.
-\ 
+\
 : menu-redraw ( -- )
 	menu-erase
 	menu-create
@@ -1066,7 +1065,7 @@ only forth definitions also menu-infrastructure
 
 \ This function initializes the menu. Call this from your `loader.rc' file
 \ before calling any other menu-related functions.
-\ 
+\
 : menu-init ( -- )
 	menu_start
 	1- menuidx !    \ Initialize the starting index for the menu
@@ -1109,13 +1108,13 @@ only forth definitions also menu-infrastructure
 		42 13 menuX @ 3 - menuY @ 1- box \ Draw frame (w,h,x,y)
 	then
 
-	0 25 at-xy \ Move cursor to the bottom for output
+	at-bl
 ;
 
 also menu-namespace
 
 \ Main function. Call this from your `loader.rc' file.
-\ 
+\
 : menu-display ( -- )
 
 	0 menu_timeout_enabled ! \ start with automatic timeout disabled
@@ -1148,7 +1147,7 @@ also menu-namespace
 				dup 0< if
 					drop
 					menu-create
-					0 25 at-xy
+					at-bl
 					0 boot
 				then
 			then
@@ -1167,7 +1166,7 @@ also menu-namespace
 				then
 			then
 			menu_timeout_x ! ( store value on stack from above )
-        
+
 			\ read custom row position (if set)
 			s" loader_menu_timeout_y" getenv dup -1 = if
 				drop \ no custom row position
@@ -1186,7 +1185,7 @@ also menu-namespace
 
 	begin \ Loop forever
 
-		0 25 at-xy \ Move cursor to the bottom for output
+		at-bl
 		getkey     \ Block here, waiting for a key to be pressed
 
 		dup -1 = if
@@ -1212,13 +1211,13 @@ also menu-namespace
 			rot tuck = if
 
 				\ Adjust for missing ACPI menuitem on non-i386
-\ 				arch-i386? true <> menuacpi @ 0<> and if
-\ 					menuacpi @ over 2dup < -rot = or
-\ 					over 58 < and if
-\ 					( key >= menuacpi && key < 58: N -- N )
-\ 						1+
-\ 					then
-\ 				then
+\				arch-i386? true <> menuacpi @ 0<> and if
+\					menuacpi @ over 2dup < -rot = or
+\					over 58 < and if
+\					( key >= menuacpi && key < 58: N -- N )
+\						1+
+\					then
+\				then
 
 				\ Test for the environment variable
 				dup menu_command[x]
@@ -1253,9 +1252,9 @@ also menu-namespace
 				swap \ need iterator on top
 			then
 
-			\ 
+			\
 			\ Check for menu keycode shortcut(s)
-			\ 
+			\
 			dup menu_keycode[x]
 			getenv dup -1 = if
 				drop
@@ -1290,7 +1289,7 @@ also menu-namespace
 
 \ This function unsets all the possible environment variables associated with
 \ creating the interactive menu.
-\ 
+\
 : menu-unset ( -- )
 
 	49 \ Iterator start (loop range 49 to 56; ASCII '1' to '8')
@@ -1341,7 +1340,7 @@ only forth definitions also menu-infrastructure
 
 \ This function both unsets menu variables and visually erases the menu area
 \ in-preparation for another menu.
-\ 
+\
 : menu-clear ( -- )
 	menu-unset
 	menu-erase
diff --git a/usr/src/boot/sys/boot/forth/screen.4th b/usr/src/boot/sys/boot/forth/screen.4th
index e0af82b3a8..fe5a684002 100644
--- a/usr/src/boot/sys/boot/forth/screen.4th
+++ b/usr/src/boot/sys/boot/forth/screen.4th
@@ -1,7 +1,8 @@
 \ Copyright (c) 2003 Scott Long <scottl@FreeBSD.org>
 \ Copyright (c) 2015 Devin Teske <dteske@FreeBSD.org>
+\ Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 \ All rights reserved.
-\ 
+\
 \ Redistribution and use in source and binary forms, with or without
 \ modification, are permitted provided that the following conditions
 \ are met:
@@ -10,7 +11,7 @@
 \ 2. Redistributions in binary form must reproduce the above copyright
 \    notice, this list of conditions and the following disclaimer in the
 \    documentation and/or other materials provided with the distribution.
-\ 
+\
 \ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 \ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 \ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -22,8 +23,6 @@
 \ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ SUCH DAMAGE.
-\ 
-\ $FreeBSD$
 
 marker task-screen.4th
 
@@ -72,3 +71,11 @@ marker task-screen.4th
 	repeat
 	2drop drop
 ;
+
+\ Get the number of screen rows/columns
+: sr ( -- y ) 25 s" screen-#rows" getenvn ;
+: sc ( -- x ) 80 s" screen-#cols" getenvn ;
+
+\ Place the cursor at the bottom left of the screen
+: at-bl 0 sr at-xy ;
+
diff --git a/usr/src/boot/sys/boot/forth/support.4th b/usr/src/boot/sys/boot/forth/support.4th
index 7a3164ee99..31420929d9 100644
--- a/usr/src/boot/sys/boot/forth/support.4th
+++ b/usr/src/boot/sys/boot/forth/support.4th
@@ -201,8 +201,31 @@ create last_module_option sizeof module.next allot 0 last_module_option !
 : 2r> postpone r> postpone r> ; immediate
 : 2r@ postpone 2r> postpone 2dup postpone 2>r ; immediate
 
+\ Number to string
+: n2s ( n -- c-addr/u ) s>d <# #s #> ;
+\ String to number
+: s2n ( c-addr/u1 -- u2 | -1 ) ?number 0= if -1 then ;
+
+\ Test if an environment variable is set
 : getenv?  getenv -1 = if false else drop true then ;
 
+\ Fetch a number from an environment variable, or a default if not set or does
+\ not parse (s2n returns -1).
+: getenvn ( n1 c-addr/u -- n1 | n2 )
+	getenv dup -1 = if
+		\ environment variable not set
+		drop		( n1 -1 -- n1 )
+	else
+		s2n		( n1 c-addr/u1 -- n1 n2 )
+		dup -1 = if
+			\ parse failed
+			drop	( n1 n2 -- n1 )
+		else
+			nip	( n1 n2 -- n2 )
+		then
+	then
+;
+
 \ Returns TRUE if the framebuffer is active, FALSE otherwise
 : framebuffer? ( -- flag )
 	\ Use the screen-height variable as a proxy for framebuffer
diff --git a/usr/src/boot/sys/boot/forth/version.4th b/usr/src/boot/sys/boot/forth/version.4th
index a5311b4442..ee1b178c1b 100644
--- a/usr/src/boot/sys/boot/forth/version.4th
+++ b/usr/src/boot/sys/boot/forth/version.4th
@@ -1,6 +1,7 @@
 \ Copyright (c) 2006-2015 Devin Teske <dteske@FreeBSD.org>
+\ Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 \ All rights reserved.
-\ 
+\
 \ Redistribution and use in source and binary forms, with or without
 \ modification, are permitted provided that the following conditions
 \ are met:
@@ -9,7 +10,7 @@
 \ 2. Redistributions in binary form must reproduce the above copyright
 \    notice, this list of conditions and the following disclaimer in the
 \    documentation and/or other materials provided with the distribution.
-\ 
+\
 \ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 \ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 \ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -21,8 +22,6 @@
 \ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ SUCH DAMAGE.
-\ 
-\ $FreeBSD$
 
 marker task-version.4th
 
@@ -90,7 +89,7 @@ only forth definitions also version-processing
 	-rot type
 	if me then
 
-	0 25 at-xy
+	at-bl
 ;
 
 only forth definitions
diff --git a/usr/src/boot/sys/cddl/boot/zfs/zfsimpl.h b/usr/src/boot/sys/cddl/boot/zfs/zfsimpl.h
index ed82362221..6c61f6e0c9 100644
--- a/usr/src/boot/sys/cddl/boot/zfs/zfsimpl.h
+++ b/usr/src/boot/sys/cddl/boot/zfs/zfsimpl.h
@@ -1,4 +1,4 @@
-/*-
+/*
  * Copyright (c) 2002 McAfee, Inc.
  * All rights reserved.
  *
@@ -59,6 +59,9 @@
  * Copyright (c) 2013 by Delphix. All rights reserved.
  */
 
+#ifndef _ZFSIMPL_H
+#define	_ZFSIMPL_H
+
 #define	MAXNAMELEN	256
 
 #define _NOTE(s)
@@ -76,7 +79,8 @@
 #define	P2ROUNDUP(x, align)		(-(-(x) & -(align)))
 #define	P2END(x, align)			(-(~(x) & -(align)))
 #define	P2PHASEUP(x, align, phase)	((phase) - (((phase) - (x)) & -(align)))
-#define	P2BOUNDARY(off, len, align)	(((off) ^ ((off) + (len) - 1)) > (align) - 1)
+#define	P2BOUNDARY(off, len, align)	\
+	(((off) ^ ((off) + (len) - 1)) > (align) - 1)
 
 /*
  * General-purpose 32-bit and 64-bit bitfield encodings.
@@ -675,7 +679,7 @@ typedef enum {
 #define	SPA_VERSION_SNAP_PROPS		SPA_VERSION_12
 #define	SPA_VERSION_USED_BREAKDOWN	SPA_VERSION_13
 #define	SPA_VERSION_PASSTHROUGH_X	SPA_VERSION_14
-#define SPA_VERSION_USERSPACE		SPA_VERSION_15
+#define	SPA_VERSION_USERSPACE		SPA_VERSION_15
 #define	SPA_VERSION_STMF_PROP		SPA_VERSION_16
 #define	SPA_VERSION_RAIDZ3		SPA_VERSION_17
 #define	SPA_VERSION_USERREFS		SPA_VERSION_18
@@ -739,10 +743,10 @@ typedef enum {
  * 'vdev_state' entry.  This is because a device can be in multiple states, such
  * as offline and degraded.
  */
-#define	ZPOOL_CONFIG_OFFLINE            "offline"
-#define	ZPOOL_CONFIG_FAULTED            "faulted"
-#define	ZPOOL_CONFIG_DEGRADED           "degraded"
-#define	ZPOOL_CONFIG_REMOVED            "removed"
+#define	ZPOOL_CONFIG_OFFLINE		"offline"
+#define	ZPOOL_CONFIG_FAULTED		"faulted"
+#define	ZPOOL_CONFIG_DEGRADED		"degraded"
+#define	ZPOOL_CONFIG_REMOVED		"removed"
 #define	ZPOOL_CONFIG_FRU		"fru"
 #define	ZPOOL_CONFIG_AUX_STATE		"aux_state"
 
@@ -1122,6 +1126,8 @@ typedef struct sa_hdr_phys {
 #define	SA_PARENT_OFFSET	40
 #define	SA_SYMLINK_OFFSET	160
 
+#define	ZIO_OBJSET_MAC_LEN	32
+
 /*
  * Intent log header - this on disk structure holds fields to manage
  * the log.  All fields are 64 bit to easily handle cross architectures.
@@ -1134,17 +1140,28 @@ typedef struct zil_header {
 	uint64_t zh_pad[5];
 } zil_header_t;
 
-#define	OBJSET_PHYS_SIZE 2048
+#define	OBJSET_PHYS_SIZE_V2 2048
+#define	OBJSET_PHYS_SIZE_V3 4096
+
+#define	OBJSET_PHYS_PAD0_SIZE	\
+	(OBJSET_PHYS_SIZE_V2 - sizeof (dnode_phys_t) * 3 -	\
+	    sizeof (zil_header_t) - sizeof (uint64_t) * 2 -	\
+	    2 * ZIO_OBJSET_MAC_LEN)
+#define	OBJSET_PHYS_PAD1_SIZE	\
+	(OBJSET_PHYS_SIZE_V3 - OBJSET_PHYS_SIZE_V2 - sizeof (dnode_phys_t))
 
 typedef struct objset_phys {
 	dnode_phys_t os_meta_dnode;
 	zil_header_t os_zil_header;
 	uint64_t os_type;
 	uint64_t os_flags;
-	char os_pad[OBJSET_PHYS_SIZE - sizeof (dnode_phys_t)*3 -
-	    sizeof (zil_header_t) - sizeof (uint64_t)*2];
+	uint8_t os_portable_mac[ZIO_OBJSET_MAC_LEN];
+	uint8_t os_local_mac[ZIO_OBJSET_MAC_LEN];
+	char os_pad0[OBJSET_PHYS_PAD0_SIZE];
 	dnode_phys_t os_userused_dnode;
 	dnode_phys_t os_groupused_dnode;
+	dnode_phys_t os_projectused_dnode;
+	char os_pad1[OBJSET_PHYS_PAD1_SIZE];
 } objset_phys_t;
 
 typedef struct dsl_dir_phys {
@@ -1467,7 +1484,7 @@ typedef struct ace {
 	uint16_t	a_type;		/* allow or deny */
 } ace_t;
 
-#define ACE_SLOT_CNT	6
+#define	ACE_SLOT_CNT	6
 
 typedef struct zfs_znode_acl {
 	uint64_t	z_acl_extern_obj;	  /* ext acl pieces */
@@ -1562,3 +1579,5 @@ typedef struct spa {
 } spa_t;
 
 static void decode_embedded_bp_compressed(const blkptr_t *, void *);
+
+#endif	/* _ZFSIMPL_H */
diff --git a/usr/src/cmd/abi/appcert/static_prof/Makefile.com b/usr/src/cmd/abi/appcert/static_prof/Makefile.com
index de7b69f031..47e182f136 100644
--- a/usr/src/cmd/abi/appcert/static_prof/Makefile.com
+++ b/usr/src/cmd/abi/appcert/static_prof/Makefile.com
@@ -26,6 +26,7 @@
 #
 # Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include		$(SRC)/cmd/Makefile.cmd
 
@@ -35,6 +36,9 @@ SRCS = $(PROG:%=../%.c)
 CERRWARN +=	-_gcc=-Wno-unused-value
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lelf
 
 LINTFLAGS =	-nmxsuF -errtags=yes
diff --git a/usr/src/cmd/abi/spectrans/Makefile.cmd b/usr/src/cmd/abi/spectrans/Makefile.cmd
index 83b1d60cc5..131a8d2d5e 100644
--- a/usr/src/cmd/abi/spectrans/Makefile.cmd
+++ b/usr/src/cmd/abi/spectrans/Makefile.cmd
@@ -22,8 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 include $(SRC)/cmd/Makefile.cmd
 
@@ -40,6 +39,9 @@ CPPFLAGS +=	-I$(U_BASE) -I..
 LDFLAGS	+=	-L$(U_DIR)
 LINTFLAGS +=	-xsuF -errtags=yes
 
+# not linted
+SMATCH=off
+
 LDLIBS	+=	-l$(U_LIB) -lgen
 LINTLIBS =	-L$(U_DIR) -l$(U_LIB)
 
diff --git a/usr/src/cmd/abi/spectrans/parser/Makefile.targ b/usr/src/cmd/abi/spectrans/parser/Makefile.targ
index 314a5daf49..525b5bf824 100644
--- a/usr/src/cmd/abi/spectrans/parser/Makefile.targ
+++ b/usr/src/cmd/abi/spectrans/parser/Makefile.targ
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 .KEEP_STATE:
 
@@ -45,6 +46,9 @@ CERRWARN	+= -_gcc=-Wno-parentheses
 CERRWARN	+= -_gcc=-Wno-unused-label
 CERRWARN	+= -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 objs/%.o: ../%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
diff --git a/usr/src/cmd/abi/spectrans/spec2trace/Makefile.targ b/usr/src/cmd/abi/spectrans/spec2trace/Makefile.targ
index 35fbdb839d..b07e6419d2 100644
--- a/usr/src/cmd/abi/spectrans/spec2trace/Makefile.targ
+++ b/usr/src/cmd/abi/spectrans/spec2trace/Makefile.targ
@@ -26,6 +26,7 @@
 #
 # Copyright 2015 Nexenta Systems, Inc.  All right reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 .KEEP_STATE:
 
@@ -49,3 +50,7 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-unused-label
+
+# not linted
+SMATCH=off
+
diff --git a/usr/src/cmd/acct/Makefile b/usr/src/cmd/acct/Makefile
index d199c32082..9d0b80f96a 100644
--- a/usr/src/cmd/acct/Makefile
+++ b/usr/src/cmd/acct/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		acctcms acctcom acctcon acctcon1 acctcon2 \
 		acctdisk acctdusg acctmerg accton acctprc acctprc1 \
@@ -92,6 +93,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-address
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 .PARALLEL: $(ALL)
diff --git a/usr/src/cmd/acct/lib/Makefile b/usr/src/cmd/acct/lib/Makefile
index c7e94d6c0d..8468349fc6 100644
--- a/usr/src/cmd/acct/lib/Makefile
+++ b/usr/src/cmd/acct/lib/Makefile
@@ -19,14 +19,13 @@
 #
 # CDDL HEADER END
 #
-#
 # Copyright (c) 1989 by Sun Microsystems, Inc.
-#
+# Copyright (c) 2018, Joyent, Inc.
 #
 LIBS=	a.a
 
-OBJS=	pnpsplit.o  copyn.o devtolin.o expand.o lintodev.o \
-	namtouid.o tmless.o tmsecs.o uidtonam.o substr.o 
+OBJS=	pnpsplit.o devtolin.o expand.o lintodev.o \
+	namtouid.o tmless.o tmsecs.o uidtonam.o substr.o
 SRCS=	$(OBJS:%.o=%.c)
 
 include	../../Makefile.cmd
@@ -36,6 +35,9 @@ CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-extra
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 .PARALLEL: $(OBJS)
diff --git a/usr/src/cmd/acpi/acpidump/Makefile b/usr/src/cmd/acpi/acpidump/Makefile
index cb4244283b..73f6991c92 100644
--- a/usr/src/cmd/acpi/acpidump/Makefile
+++ b/usr/src/cmd/acpi/acpidump/Makefile
@@ -27,6 +27,9 @@ VPATH = ../common:$(SRC)/common/acpica/utilities:$(SRC)/common/acpica/tables
 
 CERRWARN += -_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 CPPFLAGS += -I$(SRC)/uts/intel/sys/acpi -DACPI_DUMP_APP
 
 LDLIBS += -ldevinfo
diff --git a/usr/src/cmd/acpi/acpixtract/Makefile b/usr/src/cmd/acpi/acpixtract/Makefile
index f2204b9941..e0be3125ad 100644
--- a/usr/src/cmd/acpi/acpixtract/Makefile
+++ b/usr/src/cmd/acpi/acpixtract/Makefile
@@ -26,6 +26,9 @@ VPATH = ../common:$(SRC)/common/acpica/utilities
 
 CERRWARN += -_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 CPPFLAGS += -I$(SRC)/uts/intel/sys/acpi -DACPI_XTRACT_APP
 
 .KEEP_STATE:
diff --git a/usr/src/cmd/adbgen/Makefile.com b/usr/src/cmd/adbgen/Makefile.com
index 17afe7784a..beeef6c0b0 100644
--- a/usr/src/cmd/adbgen/Makefile.com
+++ b/usr/src/cmd/adbgen/Makefile.com
@@ -25,6 +25,7 @@
 #
 # Copyright 2015 RackTop Systems.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROGS = adbgen1 adbgen3 adbgen4
 OBJS = adbsub.o
@@ -36,6 +37,10 @@ CLOBBERFILES = $(PROGS) $(OBJS) $(SCRIPTS)
 .KEEP_STATE:
 
 include ../../Makefile.cmd
+include ../../Makefile.targ
+
+# not linted
+SMATCH=off
 
 ROOTADBDIR32	= $(ROOT)/usr/lib/adb
 ROOTADBDIR64	= $(ROOT)/usr/lib/adb/$(MACH64)
@@ -77,5 +82,3 @@ $(ROOTADBDIR32):
 
 $(ROOTADBDIR64): $(ROOTADBDIR32)
 	$(INS.dir)
-
-include ../../Makefile.targ
diff --git a/usr/src/cmd/addbadsec/Makefile b/usr/src/cmd/addbadsec/Makefile
index 5903d759ff..fc45ac9abe 100644
--- a/usr/src/cmd/addbadsec/Makefile
+++ b/usr/src/cmd/addbadsec/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= 		addbadsec
 OBJECTS=	addbadsec.o ix_altsctr.o
@@ -34,6 +35,9 @@ CPPFLAGS += -D_EXTVTOC
 
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/allocate/Makefile b/usr/src/cmd/allocate/Makefile
index 41339cdde6..637283c06c 100644
--- a/usr/src/cmd/allocate/Makefile
+++ b/usr/src/cmd/allocate/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 ETCTSOLFILES =	devalloc_defaults
 
@@ -32,6 +33,9 @@ CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-clobbered
 
+# not linted
+SMATCH=off
+
 ROOTSEC =	$(ROOTETC)/security
 ROOTSECDEV =	$(ROOTSEC)/dev
 ROOTSECLIB =	$(ROOTSEC)/lib
diff --git a/usr/src/cmd/ast/msgcc/Makefile b/usr/src/cmd/ast/msgcc/Makefile
index 1198c6184f..306cb54f72 100644
--- a/usr/src/cmd/ast/msgcc/Makefile
+++ b/usr/src/cmd/ast/msgcc/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 SHELL=/usr/bin/ksh93
 
@@ -51,6 +52,9 @@ CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-empty-body
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LDLIBS += -last
 msgcpp   := LDLIBS += -lpp
 
diff --git a/usr/src/cmd/audio/audioplay/Makefile b/usr/src/cmd/audio/audioplay/Makefile
index f899ec0e32..23ce81e74d 100644
--- a/usr/src/cmd/audio/audioplay/Makefile
+++ b/usr/src/cmd/audio/audioplay/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	audioplay
 
@@ -40,6 +41,8 @@ CFLAGS += $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+SMOFF += indenting
+
 LINTFLAGS += -m -v -u $(LDFLAGS)
 
 .KEEP_STATE:
diff --git a/usr/src/cmd/audio/utilities/Makefile b/usr/src/cmd/audio/utilities/Makefile
index 4b11e0eec9..d2d68162b1 100644
--- a/usr/src/cmd/audio/utilities/Makefile
+++ b/usr/src/cmd/audio/utilities/Makefile
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# Makefile for C++ Audio Library (libAudio.a) 
+# Copyright (c) 2018, Joyent, Inc.
 
 include ../../Makefile.cmd
 
@@ -37,6 +37,9 @@ CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 LINTFLAGS += -m -v -u
 
 AR=     /usr/ccs/bin/ar
diff --git a/usr/src/cmd/auditd/Makefile b/usr/src/cmd/auditd/Makefile
index be82c21abc..a61c459db5 100644
--- a/usr/src/cmd/auditd/Makefile
+++ b/usr/src/cmd/auditd/Makefile
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG = auditd
 
@@ -39,6 +40,8 @@ CPPFLAGS += -I$(LIBBSM) -I$(AUDITD)
 
 CERRWARN += -_gcc=-Wno-parentheses
 
+SMOFF += macros
+
 LDLIBS += -lbsm -lsecdb
 
 OBJS = auditd.o doorway.o queue.o
diff --git a/usr/src/cmd/auditreduce/Makefile b/usr/src/cmd/auditreduce/Makefile
index e84d51d229..2ddee8299b 100644
--- a/usr/src/cmd/auditreduce/Makefile
+++ b/usr/src/cmd/auditreduce/Makefile
@@ -24,7 +24,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 TABLEDIR = ../praudit
 
@@ -44,6 +44,9 @@ LDLIBS += -lnsl -lbsm -lscf -ltsol
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-parentheses
 
+# false positives / need cleanup
+SMOFF += indenting,no_if_block,strcpy_overflow
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/awk/Makefile b/usr/src/cmd/awk/Makefile
index 3eb805c71a..0b38940b29 100644
--- a/usr/src/cmd/awk/Makefile
+++ b/usr/src/cmd/awk/Makefile
@@ -24,6 +24,7 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 # NOTE: awk is oawk.
 
@@ -42,6 +43,9 @@ CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 #
 # Message catalog
 #
diff --git a/usr/src/cmd/awk_xpg4/Makefile b/usr/src/cmd/awk_xpg4/Makefile
index dce7e2639c..dc03ef3b1e 100644
--- a/usr/src/cmd/awk_xpg4/Makefile
+++ b/usr/src/cmd/awk_xpg4/Makefile
@@ -25,6 +25,7 @@
 #
 # cmd/awk_xpg4/Makefile
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 # NOTE: this is nawk in usr/src/cmd/awk_xpg4 to reside as /usr/xpg4/bin/awk
 
@@ -48,6 +49,9 @@ YFLAGS += -d
 LDLIBS += -lm
 CLEANFILES= awk.c y.tab.h
 
+# not linted
+SMATCH=off
+
 # for messaging catalog
 
 POFILE= awk_xpg4.po
diff --git a/usr/src/cmd/backup/Makefile.backup b/usr/src/cmd/backup/Makefile.backup
index 17d8986bf6..5a4712eb6e 100644
--- a/usr/src/cmd/backup/Makefile.backup
+++ b/usr/src/cmd/backup/Makefile.backup
@@ -23,6 +23,7 @@
 #
 # cmd/backup/Makefile.backup
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include $(SRC)/cmd/Makefile.cmd
 
@@ -44,6 +45,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-clobbered
 
+# not linted
+SMATCH=off
+
 UFSROOTETC=		$(ROOT)/etc
 UFSROOTUSR=		$(ROOT)/usr
 UFSROOTUSRLIB=		$(UFSROOTUSR)/lib
diff --git a/usr/src/cmd/bart/Makefile b/usr/src/cmd/bart/Makefile
index e36bbe26cd..67623232e0 100644
--- a/usr/src/cmd/bart/Makefile
+++ b/usr/src/cmd/bart/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	bart
 SRCS=	rules.c create.c compare.c main.c lutbl.c
@@ -34,6 +35,8 @@ LDLIBS +=	-lsec -lmd
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+SMOFF +=	indenting
+
 #
 # for messaging catalog
 #
@@ -46,7 +49,7 @@ ROOTLIBDIFFH=	$(DIFFH:%=$(ROOTLIB)/%)
 
 .KEEP_STATE:
 
-all:	$(PROG) 
+all:	$(PROG)
 
 $(PROG):	$(OBJS)
 	$(CC) -o $(PROG) $(OBJS) $(LDFLAGS) $(LDLIBS)
diff --git a/usr/src/cmd/bc/Makefile b/usr/src/cmd/bc/Makefile
index e910d2cd59..85848c2fd7 100644
--- a/usr/src/cmd/bc/Makefile
+++ b/usr/src/cmd/bc/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= bc
 XPG6PROG= bc
@@ -39,6 +40,9 @@ CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-unused-label
 
+# nothing lintable
+SMATCH=off
+
 $(XPG6EXOBJS) := CFLAGS += -DXPG6
 ROOTLIBB= $(LIBB:%=$(ROOTLIB)/%)
 $(ROOTLIBB) :=	FILEMODE =	$(LIBFILEMODE)
diff --git a/usr/src/cmd/bdiff/Makefile b/usr/src/cmd/bdiff/Makefile
index 9ce2350115..0b76705ff5 100644
--- a/usr/src/cmd/bdiff/Makefile
+++ b/usr/src/cmd/bdiff/Makefile
@@ -23,6 +23,7 @@
 # Copyright (c) 1989, 1996 by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= bdiff 
 
@@ -33,6 +34,9 @@ FILEMODE=	755
 CPPFLAGS += -D_FILE_OFFSET_BITS=64
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG) 
diff --git a/usr/src/cmd/boot/bootadm/Makefile b/usr/src/cmd/boot/bootadm/Makefile
index da5dbf5332..9946fef461 100644
--- a/usr/src/cmd/boot/bootadm/Makefile
+++ b/usr/src/cmd/boot/bootadm/Makefile
@@ -25,7 +25,7 @@
 # Copyright 2016 Toomas Soome <tsoome@me.com>
 # Copyright 2016 Nexenta Systems, Inc.
 # Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= bootadm
 
@@ -52,6 +52,8 @@ CFLAGS +=	$(XSTRCONST)
 CPPFLAGS +=	-D_FILE_OFFSET_BITS=64
 CPPFLAGS +=	-I$(SRC)/uts/common -I$(SRC)/common -I$(SRC)/common/ficl
 
+SMOFF +=	all_func_returns
+
 CSTD=	$(CSTD_GNU99)
 
 LINTFLAGS += -erroff=E_INCONS_ARG_DECL2
diff --git a/usr/src/cmd/boot/fiocompress/Makefile b/usr/src/cmd/boot/fiocompress/Makefile
index cf64ed1c6e..158a9a5863 100644
--- a/usr/src/cmd/boot/fiocompress/Makefile
+++ b/usr/src/cmd/boot/fiocompress/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= fiocompress
 
@@ -39,6 +40,8 @@ LDLIBS +=	-lz
 CFLAGS +=	-I../../../uts/common
 LINTFLAGS +=	-I../../../uts/common
 
+SMOFF += 	leaks
+
 all: $(PROG)
 
 $(PROG): $(OBJS)
diff --git a/usr/src/cmd/boot/installgrub/Makefile b/usr/src/cmd/boot/installgrub/Makefile
index 3269e7d7ef..e8cdc18cdc 100644
--- a/usr/src/cmd/boot/installgrub/Makefile
+++ b/usr/src/cmd/boot/installgrub/Makefile
@@ -20,7 +20,7 @@
 #
 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2015, Nexenta Systems, Inc.
-# 
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= installgrub
 
@@ -40,6 +40,9 @@ include ../Makefile.com
 CPPFLAGS += -I$(SRC)/uts/i86pc -I$(SRC)/uts/intel -I$(SRC)/uts/common
 CPPFLAGS += -I$(SRC)/common/util
 
+# not linted
+SMATCH=off
+
 LDLIBS += -lmd5
 
 i386_CFLAGS += -D_LARGEFILE64_SOURCE
diff --git a/usr/src/cmd/captoinfo/Makefile b/usr/src/cmd/captoinfo/Makefile
index 45313d00dd..3318414d11 100644
--- a/usr/src/cmd/captoinfo/Makefile
+++ b/usr/src/cmd/captoinfo/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= captoinfo
 
@@ -36,9 +37,12 @@ LDLIBS +=	-lcurses
 CPPFLAGS +=	-I../../lib/libcurses/screen
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# code is a mess right now
+SMATCH=off
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 $(PROG): $(OBJS) $(MAPFILE.INT)
 	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
diff --git a/usr/src/cmd/cdrw/Makefile b/usr/src/cmd/cdrw/Makefile
index 2b626aeb59..f44584ed69 100644
--- a/usr/src/cmd/cdrw/Makefile
+++ b/usr/src/cmd/cdrw/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= cdrw
 
@@ -42,6 +43,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CPPFLAGS +=	-D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(HAL_DBUS_CPPFLAGS)
 LINTFLAGS += 	-um
 
+# not linted
+SMATCH=off
+
 $(ROOTBIN)/cdrw := FILEMODE = 04755
 
 .KEEP_STATE:
@@ -52,7 +56,7 @@ $(PROG): $(OBJS)
 	$(LINK.c) -o $(PROG) $(OBJS) $(LDLIBS) $(NONLINTLDLIBS) $(CFLAGS)
 	$(POST_PROCESS)
 
-install: all $(ROOTPROG) 
+install: all $(ROOTPROG)
 
 clean:
 	$(RM) $(OBJS)
diff --git a/usr/src/cmd/cfgadm/Makefile b/usr/src/cmd/cfgadm/Makefile
index ba1d06d514..08280bcb91 100644
--- a/usr/src/cmd/cfgadm/Makefile
+++ b/usr/src/cmd/cfgadm/Makefile
@@ -23,11 +23,9 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/cfgadm/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
-PROG= cfgadm 
+PROG= cfgadm
 
 include ../Makefile.cmd
 
@@ -36,12 +34,14 @@ DCFILE= $(PROG).dc
 
 XGETFLAGS += -a -x cfgadm.xcl
 
-LDLIBS += -lcfgadm 
+LDLIBS += -lcfgadm
 LINTFLAGS += $(ENVLDFLAGS1) $(ENVLDFLAGS2) $(ENVLDFLAGS3) $(LDLIBS)
 
+SMOFF += snprintf_overflow
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTUSRSBINPROG)
 	-$(RM) $(ROOTETCPROG)
diff --git a/usr/src/cmd/cmd-crypto/pktool/Makefile b/usr/src/cmd/cmd-crypto/pktool/Makefile
index d33a9d5cc9..45a0113ca3 100644
--- a/usr/src/cmd/cmd-crypto/pktool/Makefile
+++ b/usr/src/cmd/cmd-crypto/pktool/Makefile
@@ -21,6 +21,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =	pktool
 
@@ -55,7 +56,10 @@ CFLAGS += $(CCVERBOSE) -DDEBUG
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-unused-label
 
-LDLIBS +=  -lkmf -lpkcs11 -lcryptoutil 
+# not linted, too much mess, but it should be
+SMATCH=off
+
+LDLIBS +=  -lkmf -lpkcs11 -lcryptoutil
 
 .KEEP_STATE:
 
diff --git a/usr/src/cmd/cmd-inet/lib/nwamd/Makefile b/usr/src/cmd/cmd-inet/lib/nwamd/Makefile
index 28648b59bc..160b027d0c 100644
--- a/usr/src/cmd/cmd-inet/lib/nwamd/Makefile
+++ b/usr/src/cmd/cmd-inet/lib/nwamd/Makefile
@@ -21,8 +21,7 @@
 #
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# usr/src/cmd/cmd-inet/lib/nwamd/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 # Needed for ROOTFS_LIBDIR definition
 include		../../../../lib/Makefile.lib
@@ -60,6 +59,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-unused-label
 
+# not linted
+SMATCH=off
+
 #
 # Instrument with CTF data to ease debugging.
 #
diff --git a/usr/src/cmd/cmd-inet/sbin/dhcpagent/Makefile b/usr/src/cmd/cmd-inet/sbin/dhcpagent/Makefile
index f94222fc72..7c552b830f 100644
--- a/usr/src/cmd/cmd-inet/sbin/dhcpagent/Makefile
+++ b/usr/src/cmd/cmd-inet/sbin/dhcpagent/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 # Copyright (c) 2016, Chris Fraire <cfraire@me.com>.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG    = dhcpagent
@@ -41,6 +42,9 @@ XGETFLAGS += -a -x dhcpagent.xcl
 CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 #
 # to compile a debug version, do a `make COPTFLAG="-g -XO0"'
 #
diff --git a/usr/src/cmd/cmd-inet/usr.bin/Makefile b/usr/src/cmd/cmd-inet/usr.bin/Makefile
index 68ecf76b36..6e47c6e6f0 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/Makefile
@@ -24,6 +24,7 @@
 #
 # Copyright 2011 Nexenta Systems, Inc. All rights reserved.
 # Copyright 2016 Toomas Soome <tsoome@me.com>
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG=		finger rdate ruptime rwho whois
@@ -34,7 +35,7 @@ KCMDPROGS=	rcp rlogin rsh
 
 SUBDIRS=	chat dns-sd ftp nc nca netstat \
 		pppd pppdump pppstats rdist talk telnet tftp
-SUBDIR1=	talk 
+SUBDIR1=	talk
 MSGSUBDIRS=	nca talk
 
 # As programs get lint-clean, add them here.  Eventually.
@@ -75,6 +76,8 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+ruptime :=     SMOFF += leaks
+
 # Eventually just plain CFLAGS should be += -v, but not until all in
 # PROGS are lint clean.
 $(LINTCLEAN)	:=	CFLAGS += $(CCVERBOSE)
@@ -148,7 +151,7 @@ $(COMMONOBJS): $(COMMONSRCS)
 rlogin: rlogin.o $(COMMONOBJS)
 	$(LINK.c) $@.o $(COMMONOBJS) -o $@ $(LDLIBS)
 	$(POST_PROCESS)
- 
+
 rcp: rcp.o $(COMMONOBJS)
 	$(LINK.c) $@.o $(COMMONOBJS) -o $@ $(LDLIBS)
 	$(POST_PROCESS)
@@ -156,7 +159,7 @@ rcp: rcp.o $(COMMONOBJS)
 rsh: rsh.o $(COMMONOBJS)
 	$(LINK.c) $@.o $(COMMONOBJS) -o $@ $(LDLIBS)
 	$(POST_PROCESS)
- 
+
 $(ROOTSUNWRCP):
 	$(RM) $@; $(SYMLINK) ../bin/rcp $@
 
@@ -177,7 +180,7 @@ clean_local:
 
 clobber: $(SUBDIRS) clobber_local
 clobber_local: clean_local
-	$(RM) $(CLOBBERFILES) 
+	$(RM) $(CLOBBERFILES)
 
 LINTLOCALS=	$(LINTCLEAN:%.c=lint-%)
 
diff --git a/usr/src/cmd/cmd-inet/usr.bin/chat/Makefile b/usr/src/cmd/cmd-inet/usr.bin/chat/Makefile
index 23766b3a65..f0e4c3e0c9 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/chat/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/chat/Makefile
@@ -2,6 +2,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 #  Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		chat
 OBJS=		chat.o
@@ -14,6 +15,9 @@ LDFLAGS +=	$(MAPFILE.NGB:%=-M%)
 CERRWARN +=	-_gcc=-Wno-unused-value
 CERRWARN +=	-_gcc=-Wno-trigraphs
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile b/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile
index 9640cc9a2d..c58b1a375f 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile
@@ -11,10 +11,9 @@
 
 #
 # Copyright 2017 Toomas Soome <tsoome@me.com>
+# Copyright (c) 2018, Joyent, Inc.
 #
 
-# cmd/cmd-inet/usr.bin/dns-sd/Makefile
-
 PROG=		dns-sd
 
 include ../../../Makefile.cmd
@@ -29,6 +28,9 @@ CPPFLAGS += -I$(SRCDIR)/mDNSShared
 CPPFLAGS += -DMDNS_VERSIONSTR_NODTS
 LDLIBS += -lsocket -ldns_sd
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile b/usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile
index 91b9e2e0d7..b2cf966be6 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		ftp
 DEFAULTFILES =	ftp.dfl
@@ -44,6 +45,9 @@ CERRWARN +=	-_gcc=-Wno-clobbered
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-address
 
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lsocket -lnsl -lgss
 
 # ftp defines its own delete and glob - localize all symbols to prevent a
diff --git a/usr/src/cmd/cmd-inet/usr.bin/netstat/Makefile b/usr/src/cmd/cmd-inet/usr.bin/netstat/Makefile
index 10f743130a..e4de485e4e 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/netstat/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/netstat/Makefile
@@ -24,7 +24,7 @@
 #
 # Copyright (c) 1990 Mentat Inc.
 #
-# cmd/cmd-inet/usr.bin/netstat/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		netstat
 
@@ -50,9 +50,12 @@ CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-parentheses
 LDLIBS += -ldhcpagent -lsocket -lnsl -lkstat -ltsnet -ltsol
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
-all: $(PROG) $(NPROG) 
+all: $(PROG) $(NPROG)
 
 ROOTPROG=   $(PROG:%=$(ROOTBIN)/%)
 
diff --git a/usr/src/cmd/cmd-inet/usr.bin/pppdump/Makefile b/usr/src/cmd/cmd-inet/usr.bin/pppdump/Makefile
index c8a1732e45..7908ed7488 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/pppdump/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/pppdump/Makefile
@@ -1,6 +1,7 @@
 #
 # Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2011 Nexenta Systems, Inc. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG=		pppdump
@@ -16,6 +17,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all:		$(PROG)
diff --git a/usr/src/cmd/cmd-inet/usr.bin/rdist/Makefile b/usr/src/cmd/cmd-inet/usr.bin/rdist/Makefile
index 358b559a48..837a6145e2 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/rdist/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/rdist/Makefile
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/cmd-inet/usr.bin/rdist/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	rdist
 OBJS=	docmd.o expand.o lookup.o main.o server.o
@@ -55,6 +55,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-clobbered
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 ROOTSYMLINK=	$(ROOT)/usr/ucb/$(PROG)
 
 # conditional assignments
diff --git a/usr/src/cmd/cmd-inet/usr.bin/talk/Makefile b/usr/src/cmd/cmd-inet/usr.bin/talk/Makefile
index 4c17b1bbf4..d0565eec44 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/talk/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/talk/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	talk
 OBJS=	talk.o get_names.o display.o io.o ctl.o init_disp.o \
@@ -42,6 +43,9 @@ CERRWARN +=	-_gcc=-Wno-uninitialized
 CPPFLAGS +=	-DSYSV -DSTRNET -DBSD_COMP
 LDLIBS +=	-lcurses -lsocket -lnsl
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 .PARALLEL: $(OBJS)
diff --git a/usr/src/cmd/cmd-inet/usr.bin/telnet/Makefile b/usr/src/cmd/cmd-inet/usr.bin/telnet/Makefile
index 967e6a1b6d..aa2173d849 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/telnet/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/telnet/Makefile
@@ -22,6 +22,8 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+#
 
 PROG=		telnet
 OBJS=		telnet.o commands.o main.o network.o ring.o \
@@ -53,6 +55,9 @@ LDLIBS +=	-lsocket -lnsl -ltermlib
 LDLIBS +=	-lmech_krb5 
 LDFLAGS +=	$(KRUNPATH) -L$(ROOT)$(KLIBDIR_DO) -L$(ROOT)$(KLIBDIR_GL)
 
+# "missing type for func"
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile b/usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile
index 2648c7cf05..2feba006c7 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.lib/ilbd/Makefile
@@ -20,6 +20,7 @@
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 ILBD=		ilbd
 PROG=		$(ILBD)
@@ -53,6 +54,9 @@ CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-label
 
+# not linted
+SMATCH=off
+
 CSTD =      $(CSTD_GNU99)
 
 # I18n
diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/Makefile b/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/Makefile
index e1277f4e1d..4b8faf3a3f 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.ndpd/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		in.ndpd
 OBJS=		config.o main.o ndp.o tables.o trace.o
@@ -59,6 +60,9 @@ LINTFLAGS +=	-erroff=E_BAD_PTR_CAST_ALIGN
 CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 CTFCONVERT_HOOK = && $(CTFCONVERT_O)
 CTFMERGE_HOOK = && $(CTFMERGE) -L VERSION -o $@ $(OBJS)
 $(OBJS) := CFLAGS += $(CTF_FLAGS)
diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.ripngd/Makefile b/usr/src/cmd/cmd-inet/usr.lib/in.ripngd/Makefile
index acb1a9e7be..69f8880c5a 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/in.ripngd/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.ripngd/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 SVCMETHOD=	svc-ripng
 MANIFEST=	ripng.xml
@@ -43,6 +44,9 @@ $(OBJS) :=	CPPFLAGS +=	$(_D_UNIX98_EXTN)
 
 LINTFLAGS +=	$(_D_UNIX98_EXTN)
 
+# not linted
+SMATCH=off
+
 # in.ripngd uses the ancillary data feature which is available only through
 # UNIX 98 standards version of Socket interface. This interface is supposed to
 # be accessed by -lxnet. In addition, -lsocket is used to
diff --git a/usr/src/cmd/cmd-inet/usr.lib/inetd/Makefile b/usr/src/cmd/cmd-inet/usr.lib/inetd/Makefile
index 2065957edf..4f91366ea2 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/inetd/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.lib/inetd/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG	=	inetd
 MANIFEST=	inetd.xml inetd-upgrade.xml
@@ -42,6 +43,8 @@ $(RELEASE_BUILD)CPPFLAGS +=     -DNDEBUG
 CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-unused-label
 
+SMOFF += kmalloc_wrong_size
+
 LDLIBS    += -lsocket -lnsl -lrestart -lscf -lcontract -linetutil \
 		-lwrap -linetsvc -luutil -lumem -lbsm
 
diff --git a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile
index 0aa9db8da9..7f3365c9ea 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile
@@ -22,6 +22,7 @@
 # Use is subject to license terms.
 # Copyright 2016 Toomas Soome <tsoome@me.com>
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		mdnsd
 MANIFEST=	multicast.xml
@@ -43,6 +44,13 @@ MDNSFLAGS=	-DNOT_HAVE_SA_LEN \
 
 include	../../../Makefile.cmd
 
+CERRWARN +=	-_gcc=-Wno-unused-variable
+CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
+CERRWARN +=	-_gcc=-Wno-uninitialized
+
+# not linted
+SMATCH=off
+
 ROOTMANIFESTDIR=	$(ROOTSVCNETWORKDNS)
 $(ROOTMANIFEST)		:= FILEMODE= 444
 
diff --git a/usr/src/cmd/cmd-inet/usr.lib/pppoe/Makefile b/usr/src/cmd/cmd-inet/usr.lib/pppoe/Makefile
index 09987928be..8a448c3c6c 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/pppoe/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.lib/pppoe/Makefile
@@ -23,10 +23,7 @@
 # Copyright 2000-2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/cmd-inet/usr.lib/pppoe/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 include		../../../Makefile.cmd
 
@@ -36,6 +33,9 @@ DAEMON_OBJS=	pppoed.o options.o logging.o common.o
 
 CPPFLAGS +=	-I$(SRC)/uts/common
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all:		$(PROG)
diff --git a/usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile b/usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile
index a743bed065..4957961b61 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile
@@ -21,6 +21,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		wpad
 MANIFEST =	wpa.xml
@@ -37,6 +38,8 @@ all install := LDLIBS += -lsunw_crypto
 
 LINTFLAGS += 	-u
 
+SMOFF += all_func_returns
+
 .KEEP_STATE:
 
 all:		$(PROG)
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/Makefile
index 5b2d0b1af2..88cf4c41aa 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/Makefile
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2014 Garrett D'Amore <garrett@damore.org>
-# Copyright 2018, Joyent, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 SYNCPROG=	syncinit syncloop syncstat
@@ -110,6 +110,9 @@ CERRWARN += -_gcc=-Wno-char-subscripts
 CERRWARN += -_gcc=-Wno-extra
 CERRWARN += -_gcc=-Wno-address
 
+# "missing type for func"
+SMATCH=off
+
 #
 # Message catalog
 #
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile
index 5b2f2eb275..73b2b67758 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/ilbadm/Makefile
@@ -20,6 +20,7 @@
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		ilbadm
 
@@ -39,6 +40,9 @@ CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 CSTD =	$(CSTD_GNU99)
 
 POFILES =	$(OBJS:%.o=%.po)
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/Makefile
index 4a001e9c16..4d5ca0b991 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/Makefile
@@ -21,6 +21,8 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+#
 
 PROG=		in.rdisc
 MANIFEST=	rdisc.xml
@@ -35,6 +37,9 @@ LDLIBS +=	-lsocket -lnsl
 CPPFLAGS +=	-DSYSV -DBSD_COMP
 CERRWARN +=	-_gcc=-Wno-extra
 
+# "missing type for func"
+SMATCH =	off
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/in.routed/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/in.routed/Makefile
index 8159456d34..022fc53a8b 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/in.routed/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/in.routed/Makefile
@@ -3,6 +3,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 ROUTEDPROG=	in.routed
 ROUTEDOBJS=	common.o if.o input.o main.o output.o parms.o radix.o \
@@ -39,6 +40,9 @@ CPPFLAGS +=	$(_D_XOPEN_EXTN)
 CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lxnet -lmd -lsocket
 CLEAN_FILES +=	$(ROUTEDOBJS) $(RTQUERYOBJS)
 CLOBBERFILES +=	$(ROUTEDPROG) $(RTQUERYPROG)
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/Makefile
index 28dd4654f6..485110bb74 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/Makefile
@@ -22,9 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-
-#
-# cmd/cmd-inet/usr.sbin/ipqosconf/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		ipqosconf
 OBJS=		ipqosconf.o
@@ -55,6 +53,9 @@ CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lsocket -lnsl -lnvpair -lipp
 
 .KEEP_STATE:
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/Makefile
index 2433e90df6..3cbe3dbb38 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		ikeadm ipsecalgs ipsecconf ipseckey ikecert
 SOCKETPROG=	ipsecalgs ipsecconf ipseckey 
@@ -59,6 +60,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-switch
 
+# not linted
+SMATCH=off
+
 CFLAGS += $(XSTRCONST)
 LDLIBS += -lipsecutil -lnsl
 
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/nwamadm/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/nwamadm/Makefile
index 00c4998b2b..e3984bdda6 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/nwamadm/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/nwamadm/Makefile
@@ -23,8 +23,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
-# cmd/cmd-inet/usr.sbin/nwamadm/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= nwamadm
 
@@ -36,9 +35,12 @@ LDLIBS +=	-lofmt -linetutil -lnsl -lnwam -lumem -lscf
 CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTUSRSBINPROG)
 
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/Makefile
index 0c51a0301b..25d961bdb1 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/Makefile
@@ -24,7 +24,7 @@
 # Use is subject to license terms.
 # Copyright (c) 2016, Chris Fraire <cfraire@me.com>.
 #
-# cmd/cmd-inet/usr.sbin/nwamcfg/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	nwamcfg
 OBJS=	nwamcfg.o nwamcfg_lex.o nwamcfg_grammar.tab.o
@@ -44,9 +44,11 @@ CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 
+SMOFF += all_func_returns
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 $(PROG): $(OBJS)
 	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/snoop/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/snoop/Makefile
index 5d9ef9e64d..9e6654e8f7 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/snoop/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/snoop/Makefile
@@ -22,7 +22,7 @@
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
-# Copyright 2015 Joyent, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG=	snoop
@@ -63,6 +63,9 @@ CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-unused-label
 CERRWARN += -_gcc=-Wno-unused-function
 
+# we really should have smatch running on this code but...
+SMATCH=off
+
 .KEEP_STATE:
 
 .PARALLEL: $(OBJS)
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/wificonfig/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/wificonfig/Makefile
index b5732647eb..713cbdb1aa 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/wificonfig/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/wificonfig/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		wificonfig	
 OBJS=		wificonfig.o
@@ -37,6 +38,9 @@ ROOTUSRSBINLINKS = $(ROOTUSRSBIN)/$(PROG)
 CERRWARN += -_gcc=-Wno-char-subscripts
 CERRWARN += -_gcc=-Wno-parentheses
 
+# needs work
+SMOFF += index_overflow,memcpy_overflow
+
 .KEEP_STATE:
 
 all:	$(PROG)
diff --git a/usr/src/cmd/cpc/cpustat/Makefile b/usr/src/cmd/cpc/cpustat/Makefile
index 1bf30678cd..edff7bd831 100644
--- a/usr/src/cmd/cpc/cpustat/Makefile
+++ b/usr/src/cmd/cpc/cpustat/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		cpustat
 OBJS =		$(PROG).o caps.o time.o setgrp.o strtoset.o
@@ -40,6 +41,9 @@ CERRWARN	+= -_gcc=-Wno-uninitialized
 CPPFLAGS	+= -D_REENTRANT -I$(SRC)/lib/libcpc/common -I$(STATCOMMONDIR)
 LDLIBS +=	-lcpc -lkstat
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all:	$(PROG)
diff --git a/usr/src/cmd/cpc/cputrack/Makefile.com b/usr/src/cmd/cpc/cputrack/Makefile.com
index d67fb933dd..8226e1a57c 100644
--- a/usr/src/cmd/cpc/cputrack/Makefile.com
+++ b/usr/src/cmd/cpc/cputrack/Makefile.com
@@ -22,8 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 include	../../../Makefile.cmd
 
@@ -36,6 +35,9 @@ CFLAGS +=	$(CCVERBOSE) $(CTF_FLAGS)
 CFLAGS64 +=	$(CCVERBOSE) $(CTF_FLAGS)
 CPPFLAGS +=	-I$(SRC)/lib/libcpc/common
 
+# not linted
+SMATCH=off
+
 LINTFLAGS +=	-u
 LINTFLAGS64 +=	-u
 
diff --git a/usr/src/cmd/cpio/Makefile b/usr/src/cmd/cpio/Makefile
index 3acc24cebd..ccad9b0efc 100644
--- a/usr/src/cmd/cpio/Makefile
+++ b/usr/src/cmd/cpio/Makefile
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= cpio
 
@@ -32,12 +33,15 @@ CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DSOLARIS_PRIVS
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LDLIBS += -lsec -lcmdutils -lnvpair
 XGETFLAGS += -a -x cpio.xcl
 
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 $(PROG): $(OBJS)
 	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
diff --git a/usr/src/cmd/cron/Makefile b/usr/src/cmd/cron/Makefile
index 13f825bd7a..d8df76960f 100644
--- a/usr/src/cmd/cron/Makefile
+++ b/usr/src/cmd/cron/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 DEFAULTFILES =	cron.dfl
 
@@ -40,6 +41,9 @@ CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-unused-value
 
+# not linted
+SMATCH=off
+
 ROOTVAR =	$(ROOT)/var
 
 ROOTSPCRON =	$(ROOTVAR)/spool/cron
diff --git a/usr/src/cmd/csh/i386/Makefile b/usr/src/cmd/csh/i386/Makefile
index 5f05c1b91f..c019a85dee 100644
--- a/usr/src/cmd/csh/i386/Makefile
+++ b/usr/src/cmd/csh/i386/Makefile
@@ -6,7 +6,8 @@
 # Copyright (c) 1980 Regents of the University of California.
 # All rights reserved.  The Berkeley Software License Agreement
 # specifies the terms and conditions for redistribution.
-
+#
+# Copyright (c) 2018, Joyent, Inc.
 #
 # C Shell with process control; VM/UNIX VAX Makefile
 # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
@@ -34,6 +35,9 @@ CERRWARN += -_gcc=-Wno-clobbered
 CERRWARN += -_gcc=-Wno-unused-label
 CERRWARN += -_gcc=-Wno-extra
 
+# "missing type for func"
+SMATCH=off
+
 MAPFILES =	../mapfile-intf $(MAPFILE.NGB)
 LDFLAGS +=	$(MAPFILES:%=-M%)
 
diff --git a/usr/src/cmd/cxgbetool/Makefile b/usr/src/cmd/cxgbetool/Makefile
index 4a39c9e80f..c8557b453f 100644
--- a/usr/src/cmd/cxgbetool/Makefile
+++ b/usr/src/cmd/cxgbetool/Makefile
@@ -12,12 +12,16 @@
 #
 # Copyright (c) 2018 by Chelsio Communications, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
+
 PROG =  cxgbetool
 
 include ../Makefile.cmd
 
 CFLAGS += $(CCVERBOSE) -I$(SRC)/uts/common/io/cxgbe/t4nex -I$(SRC)/uts/common/io/cxgbe/firmware
 
+SMOFF += all_func_returns
+
 all: $(PROG)
 
 install: all $(ROOTUSRSBINPROG)
diff --git a/usr/src/cmd/dc/Makefile b/usr/src/cmd/dc/Makefile
index 50f4a4e60f..58ddd81f1a 100644
--- a/usr/src/cmd/dc/Makefile
+++ b/usr/src/cmd/dc/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= dc
 XPG6PROG= dc
@@ -37,6 +38,9 @@ CERRWARN += -_gcc=-Wno-unused-value
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(MAPFILE.NGB) $(PROG) $(XPG6)
diff --git a/usr/src/cmd/devfsadm/Makefile.com b/usr/src/cmd/devfsadm/Makefile.com
index 1585db2894..b446b148ff 100644
--- a/usr/src/cmd/devfsadm/Makefile.com
+++ b/usr/src/cmd/devfsadm/Makefile.com
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 # This target builds both a command (daemon) and various shared objects.  This
 # isn't a typical target, and the inclusion of both library and command
@@ -99,6 +100,9 @@ CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-char-subscripts
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 # Define the dependencies required by devfsadm and all shared objects.
 LDLIBS +=		-ldevinfo
 devfsadm :=		LDLIBS += -lgen -lsysevent -lnvpair -lzonecfg -lbsm
diff --git a/usr/src/cmd/devmgmt/cmds/Makefile b/usr/src/cmd/devmgmt/cmds/Makefile
index 56bd277ec8..6eaec76115 100644
--- a/usr/src/cmd/devmgmt/cmds/Makefile
+++ b/usr/src/cmd/devmgmt/cmds/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include ../../Makefile.cmd
 
@@ -38,6 +39,8 @@ LDLIBS += -ladm
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+SMOFF += signed
+
 .KEEP_STATE:
 
 .PARALLEL: $(PROG)
diff --git a/usr/src/cmd/diskscan/Makefile b/usr/src/cmd/diskscan/Makefile
index fc82a22936..a9c6f0ab42 100644
--- a/usr/src/cmd/diskscan/Makefile
+++ b/usr/src/cmd/diskscan/Makefile
@@ -20,15 +20,18 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 1989, 2001 by Sun Microsystems, Inc.
 # All rights reserved.
+#
+# Copyright (c) 2018, Joyent, Inc.
+
 
 PROG= diskscan
 
 include ../Makefile.cmd
 
+SMOFF += leaks
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/dladm/Makefile b/usr/src/cmd/dladm/Makefile
index e68f441519..734ecd8268 100644
--- a/usr/src/cmd/dladm/Makefile
+++ b/usr/src/cmd/dladm/Makefile
@@ -18,12 +18,11 @@
 #
 # CDDL HEADER END
 #
-
-#
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 # Copyright 2018 Joyent, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		dladm
 ROOTFS_PROG=	$(PROG)
@@ -46,6 +45,8 @@ CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+SMOFF += snprintf_overflow
+
 # For headers from librstp.
 LINTFLAGS +=	-erroff=E_TRAILING_COMMA_IN_ENUM
 lint :=		ZLAZYLOAD=
diff --git a/usr/src/cmd/dlstat/Makefile b/usr/src/cmd/dlstat/Makefile
index c24ce1a62d..bd274d10c0 100644
--- a/usr/src/cmd/dlstat/Makefile
+++ b/usr/src/cmd/dlstat/Makefile
@@ -22,7 +22,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= dlstat
 
@@ -35,6 +35,9 @@ CERRWARN += -_gcc=-Wno-unused-label
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 XGETFLAGS += -a -x $(PROG).xcl
 LDLIBS += -L$(ROOT)/lib
 LDLIBS += -ldladm -lofmt
diff --git a/usr/src/cmd/dtrace/test/cmd/baddof/Makefile b/usr/src/cmd/dtrace/test/cmd/baddof/Makefile
index 4162cda817..086c652d2d 100644
--- a/usr/src/cmd/dtrace/test/cmd/baddof/Makefile
+++ b/usr/src/cmd/dtrace/test/cmd/baddof/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include $(SRC)/cmd/Makefile.cmd
 
@@ -40,6 +41,9 @@ CMDS = $(SRCS:%=$(ROOTBIN)/%)
 
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 $(CMDS) := FILEMODE = 0555
 
 all: $(SRCS)
diff --git a/usr/src/cmd/dtrace/test/cmd/badioctl/Makefile b/usr/src/cmd/dtrace/test/cmd/badioctl/Makefile
index 789bd0510e..ddbf401e31 100644
--- a/usr/src/cmd/dtrace/test/cmd/badioctl/Makefile
+++ b/usr/src/cmd/dtrace/test/cmd/badioctl/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include $(SRC)/cmd/Makefile.cmd
 
@@ -40,6 +41,9 @@ CMDS = $(SRCS:%=$(ROOTBIN)/%)
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-unused-variable
 
+# not linted
+SMATCH=off
+
 $(CMDS) := FILEMODE = 0555
 
 all: $(SRCS)
diff --git a/usr/src/cmd/dtrace/test/tst/Makefile.com b/usr/src/cmd/dtrace/test/tst/Makefile.com
index 336c68e086..b7100f4af5 100644
--- a/usr/src/cmd/dtrace/test/tst/Makefile.com
+++ b/usr/src/cmd/dtrace/test/tst/Makefile.com
@@ -24,7 +24,6 @@
 # Use is subject to license terms.
 #
 # Copyright (c) 2018, Joyent, Inc.
-#
 
 include $(SRC)/cmd/Makefile.cmd
 
@@ -68,6 +67,9 @@ CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-unused-function
 CERRWARN +=	-_gcc=-Wno-unused-variable
 
+# not linted
+SMATCH=off
+
 all: $(EXES)
 
 clean lint:
diff --git a/usr/src/cmd/ed/Makefile b/usr/src/cmd/ed/Makefile
index b6737d8978..0c9339377e 100644
--- a/usr/src/cmd/ed/Makefile
+++ b/usr/src/cmd/ed/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= ed
 XPG4PROG= ed
@@ -42,6 +43,10 @@ CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-unused-function
 CERRWARN += -_gcc=-Wno-uninitialized
+
+# not linted
+SMATCH=off
+
 $(XPG4) := CFLAGS += -DXPG4  
 $(XPG6) := CFLAGS += -DXPG6 -I$(SRC)/lib/libc/inc 
 lint := LDLIBS += -lgen -lcrypt
diff --git a/usr/src/cmd/eeprom/Makefile.com b/usr/src/cmd/eeprom/Makefile.com
index 248528cc9c..eab53d485d 100644
--- a/usr/src/cmd/eeprom/Makefile.com
+++ b/usr/src/cmd/eeprom/Makefile.com
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 #
 #	Create default so empty rules don't
@@ -41,6 +42,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 LINT_OBJS = $(OBJS:%.o=%.ln)
 SOURCES = $(OBJS:%.o=%.c)
 
diff --git a/usr/src/cmd/enhance/Makefile b/usr/src/cmd/enhance/Makefile
index d555d810ef..8b0e0fbec6 100644
--- a/usr/src/cmd/enhance/Makefile
+++ b/usr/src/cmd/enhance/Makefile
@@ -23,8 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= enhance
 
@@ -41,6 +40,8 @@ CPPFLAGS += -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 \
 
 lint := LINTFLAGS += -ux
 
+SMOFF += all_func_returns
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/eqn/eqn.d/Makefile b/usr/src/cmd/eqn/eqn.d/Makefile
index 8b9dfcf422..08c289eb03 100644
--- a/usr/src/cmd/eqn/eqn.d/Makefile
+++ b/usr/src/cmd/eqn/eqn.d/Makefile
@@ -2,6 +2,8 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+#
 
 include		../../Makefile.cmd
 
@@ -35,6 +37,9 @@ CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all :		$(PROG) 
diff --git a/usr/src/cmd/eqn/neqn.d/Makefile b/usr/src/cmd/eqn/neqn.d/Makefile
index 2863de2874..a50bc23501 100644
--- a/usr/src/cmd/eqn/neqn.d/Makefile
+++ b/usr/src/cmd/eqn/neqn.d/Makefile
@@ -2,6 +2,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include		../../Makefile.cmd
 
@@ -30,6 +31,9 @@ CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-label
 
+# not linted
+SMATCH=off
+
 #
 # for message catalog
 #
diff --git a/usr/src/cmd/etdump/Makefile b/usr/src/cmd/etdump/Makefile
index 1ff307b3cd..38b3ab5dd0 100644
--- a/usr/src/cmd/etdump/Makefile
+++ b/usr/src/cmd/etdump/Makefile
@@ -11,6 +11,7 @@
 
 #
 # Copyright 2019 Toomas Soome <tsoome@me.com>
+# Copyright (c) 2019, Joyent, Inc.
 #
 
 PROG=	etdump
@@ -19,6 +20,9 @@ SRCS=	$(OBJS:%.o=%.c)
 
 include ../Makefile.cmd
 
+# comes from FreeBSD upstream
+SMOFF += all_func_returns
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/expand/Makefile b/usr/src/cmd/expand/Makefile
index 157b7167f5..e6c86c72d1 100644
--- a/usr/src/cmd/expand/Makefile
+++ b/usr/src/cmd/expand/Makefile
@@ -23,8 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/expand/Makefile 
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		expand  unexpand
 SRCS=		$(PROG:=.c)
@@ -37,9 +36,11 @@ POFILE= expand.po
 
 CLOBBERFILES += expand_cmd.c
 
+SMOFF += signed
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTPROG)
 
diff --git a/usr/src/cmd/expr/Makefile b/usr/src/cmd/expr/Makefile
index dbc390fce5..08117a45a3 100644
--- a/usr/src/cmd/expr/Makefile
+++ b/usr/src/cmd/expr/Makefile
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= expr
 XPG4PROG= expr
@@ -38,6 +39,8 @@ include ../Makefile.cmd
 CFLAGS += $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-extra
+# "missing type for func"
+SMATCH=off
 $(XPG4) := CFLAGS += -DXPG4
 $(XPG6) := CFLAGS += -DXPG6
 
diff --git a/usr/src/cmd/exstr/Makefile b/usr/src/cmd/exstr/Makefile
index 3123493743..b44427a4c7 100644
--- a/usr/src/cmd/exstr/Makefile
+++ b/usr/src/cmd/exstr/Makefile
@@ -21,6 +21,7 @@
 #
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG= exstr
@@ -29,9 +30,12 @@ include ../Makefile.cmd
 
 CERRWARN += -_gcc=-Wno-extra
 
+# "missing type for func"
+SMATCH=off
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTPROG)
 
diff --git a/usr/src/cmd/factor/Makefile b/usr/src/cmd/factor/Makefile
index 05bccd0c85..0b72a49109 100644
--- a/usr/src/cmd/factor/Makefile
+++ b/usr/src/cmd/factor/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= factor
 
@@ -30,6 +31,9 @@ include ../Makefile.cmd
 LDLIBS += -lm
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG) 
diff --git a/usr/src/cmd/fcinfo/Makefile b/usr/src/cmd/fcinfo/Makefile
index ebe3fc72cd..c21b9a5ed6 100644
--- a/usr/src/cmd/fcinfo/Makefile
+++ b/usr/src/cmd/fcinfo/Makefile
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 COMMONBASE = ../../common
 
@@ -49,6 +49,9 @@ POFILES = fcinfo.po fcinfo-list.po fcadm-list.po printAttrs.po fcoeadm.po
 
 CERRWARN += -_gcc=-Wno-unused-variable
 
+# not linted
+SMATCH=off
+
 ROOTMANIFESTDIR=	$(ROOTSVCNETWORK)
 
 LDLIBS += -lHBAAPI
diff --git a/usr/src/cmd/fdformat/Makefile b/usr/src/cmd/fdformat/Makefile
index 8a04df934e..1454ef6ae5 100644
--- a/usr/src/cmd/fdformat/Makefile
+++ b/usr/src/cmd/fdformat/Makefile
@@ -22,8 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fdformat/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= fdformat
 
@@ -32,6 +31,9 @@ include ../Makefile.cmd
 LDLIBS +=	-lvolmgt
 LINTFLAGS +=    -um
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 #
@@ -39,7 +41,7 @@ LINTFLAGS +=    -um
 #
 $(ROOTPROG) := FILEMODE = 04555
 
-all: $(PROG) 
+all: $(PROG)
 
 fdformat: fdformat.c
 	$(LINK.c) -o $@ ./fdformat.c $(LDLIBS)
diff --git a/usr/src/cmd/fdisk/Makefile b/usr/src/cmd/fdisk/Makefile
index ff449b4de5..81f1788fbb 100644
--- a/usr/src/cmd/fdisk/Makefile
+++ b/usr/src/cmd/fdisk/Makefile
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 #       Makefile for fdisk
 
@@ -34,6 +34,9 @@ include ../Makefile.cmd
 
 CPPFLAGS += -D_FILE_OFFSET_BITS=64
 
+# not linted
+SMATCH=off
+
 LDLIBS_i386= -lfdisk
 LDLIBS_sparc=
 LDLIBS += -ladm -lefi $(LDLIBS_$(MACH))
diff --git a/usr/src/cmd/ficl/Makefile.com b/usr/src/cmd/ficl/Makefile.com
index 6be92a0115..86ea753503 100644
--- a/usr/src/cmd/ficl/Makefile.com
+++ b/usr/src/cmd/ficl/Makefile.com
@@ -12,6 +12,7 @@
 #
 # Copyright 2016 Toomas Soome <tsoome@me.com>
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= ficl-sys
 OBJS= main.o
@@ -23,6 +24,8 @@ include ../../Makefile.ctf
 LDLIBS += -lficl-sys -ltecla -lumem
 CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I$(SRC)/common/ficl
 
+SMOFF += all_func_returns
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/file/Makefile b/usr/src/cmd/file/Makefile
index e05f3e4689..7f7da7c2d0 100644
--- a/usr/src/cmd/file/Makefile
+++ b/usr/src/cmd/file/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= file
 XPG4PROG= file
@@ -43,6 +44,9 @@ C99LMODE= -Xc99=%all
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-type-limits
 
+# not linted
+SMATCH=off
+
 POFILE= file_all.po
 POFILES= $(SRCS:%.c=%.po)
 
diff --git a/usr/src/cmd/filesync/Makefile b/usr/src/cmd/filesync/Makefile
index 23ab3239fe..df62a44193 100644
--- a/usr/src/cmd/filesync/Makefile
+++ b/usr/src/cmd/filesync/Makefile
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= filesync
 
@@ -35,6 +36,9 @@ LDLIBS += -lgen
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 FILEMODE= 0555
 
 .KEEP_STATE:
diff --git a/usr/src/cmd/flowstat/Makefile b/usr/src/cmd/flowstat/Makefile
index e9efa364e0..c568245899 100644
--- a/usr/src/cmd/flowstat/Makefile
+++ b/usr/src/cmd/flowstat/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=flowstat
 
@@ -38,6 +39,9 @@ LDLIBS += -ldladm -lofmt
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 ROOTCFGDIR=	$(ROOTETC)/dladm
 
 .KEEP_STATE:
diff --git a/usr/src/cmd/fm/eversholt/Makefile.esc.com b/usr/src/cmd/fm/eversholt/Makefile.esc.com
index d8dbaf289c..97d684c164 100644
--- a/usr/src/cmd/fm/eversholt/Makefile.esc.com
+++ b/usr/src/cmd/fm/eversholt/Makefile.esc.com
@@ -17,12 +17,12 @@
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
-# 
 #
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # Copyright 2018 RackTop Systems.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 FMADIR = $(SRC)/cmd/fm
@@ -51,6 +51,8 @@ CERRWARN += -_gcc=-Wno-unused-label
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-switch
 
+SMOFF += all_func_returns
+
 CTFCONVO = $(CTFCONVERT_O)
 CTFMRG = $(CTFMERGE) -L VERSION -o $@ $(OBJS)
 
diff --git a/usr/src/cmd/fm/fmd/Makefile.fmd b/usr/src/cmd/fm/fmd/Makefile.fmd
index 3634df1269..1a23743d95 100644
--- a/usr/src/cmd/fm/fmd/Makefile.fmd
+++ b/usr/src/cmd/fm/fmd/Makefile.fmd
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2015 RackTop Systems.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 .KEEP_STATE:
@@ -123,6 +124,9 @@ CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-clobbered
 
+# not linted
+SMATCH=off
+
 $(PROG) := LDFLAGS += -R/usr/lib/fm
 $(PROG) := LDLIBS += -L$(ROOTLIB)/fm -ltopo -ldiagcode -lsysevent -lsmbios \
 		-luuid -lnvpair -lexacct -lnsl -lumem -ldevinfo -lfmd_msg
diff --git a/usr/src/cmd/fm/fmstat/Makefile.com b/usr/src/cmd/fm/fmstat/Makefile.com
index 0c743f8108..97ab83a828 100644
--- a/usr/src/cmd/fm/fmstat/Makefile.com
+++ b/usr/src/cmd/fm/fmstat/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 .KEEP_STATE:
 .SUFFIXES:
@@ -47,6 +48,8 @@ LDLIBS += -L$(ROOT)/usr/lib/fm -lfmd_adm
 LDFLAGS += -R/usr/lib/fm
 LINTFLAGS += -mnu
 
+SMOFF += signed
+
 .NO_PARALLEL:
 .PARALLEL: $(OBJS) $(LINTFILES)
 
diff --git a/usr/src/cmd/fm/fmtopo/Makefile.com b/usr/src/cmd/fm/fmtopo/Makefile.com
index 7b09bbbd87..d692d463aa 100644
--- a/usr/src/cmd/fm/fmtopo/Makefile.com
+++ b/usr/src/cmd/fm/fmtopo/Makefile.com
@@ -24,7 +24,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 2018, Joyent, Inc.
 
 .KEEP_STATE:
 .SUFFIXES:
@@ -45,6 +45,9 @@ LDLIBS += -L$(ROOT)/usr/lib/fm -ltopo -lnvpair
 LDFLAGS += -R/usr/lib/fm
 LINTFLAGS += -mnu
 
+# not linted
+SMATCH=off
+
 .NO_PARALLEL:
 .PARALLEL: $(OBJS) $(LINTFILES)
 
diff --git a/usr/src/cmd/fm/modules/common/disk-monitor/Makefile b/usr/src/cmd/fm/modules/common/disk-monitor/Makefile
index 4ee7343d45..3acbf7c3df 100644
--- a/usr/src/cmd/fm/modules/common/disk-monitor/Makefile
+++ b/usr/src/cmd/fm/modules/common/disk-monitor/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 MODULE = disk-monitor
 CLASS = common
@@ -35,3 +36,6 @@ CFLAGS += -I. -I$(SRC)/lib/fm/topo/modules/common/disk
 LDLIBS += -lsysevent -lnvpair -lsmbios -lcfgadm -ltopo -luutil -lipmi
 LDFLAGS += -L$(ROOT)/usr/lib/fm -R/usr/lib/fm
 CERRWARN += -_gcc=-Wno-uninitialized
+
+# not linted
+SMATCH=off
diff --git a/usr/src/cmd/fm/modules/common/eversholt/Makefile b/usr/src/cmd/fm/modules/common/eversholt/Makefile
index c71726062e..0ca385c960 100644
--- a/usr/src/cmd/fm/modules/common/eversholt/Makefile
+++ b/usr/src/cmd/fm/modules/common/eversholt/Makefile
@@ -25,6 +25,7 @@
 #
 # eft.so (the eversholt DE)
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 .KEEP_STATE:
 
@@ -49,6 +50,9 @@ CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 $(PROG) := LDFLAGS += -R/usr/lib/fm
 $(PROG) := LDLIBS += -L$(ROOTLIB)/fm -ltopo
 
diff --git a/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile b/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile
index ef2fd7530d..ce58c99d73 100644
--- a/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile
+++ b/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 MODULE = fabric-xlate
 CLASS = common
@@ -41,3 +42,6 @@ LDLIBS += -luutil -lxml2 -L$(ROOTLIB)/fm -ltopo
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-uninitialized
+
+# not linted
+SMATCH=off
diff --git a/usr/src/cmd/fm/modules/common/ip-transport/Makefile b/usr/src/cmd/fm/modules/common/ip-transport/Makefile
index 84f01180ab..bafe1caba3 100644
--- a/usr/src/cmd/fm/modules/common/ip-transport/Makefile
+++ b/usr/src/cmd/fm/modules/common/ip-transport/Makefile
@@ -24,6 +24,7 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 MODULE = ip-transport
 CLASS = common
@@ -33,3 +34,6 @@ include ../../Makefile.plugin
 
 LDLIBS += -lsocket -lnsl
 CERRWARN += -_gcc=-Wno-uninitialized
+
+# not linted
+SMATCH=off
diff --git a/usr/src/cmd/fm/modules/common/ses-log-transport/Makefile b/usr/src/cmd/fm/modules/common/ses-log-transport/Makefile
index eac67a77f9..0188e38a35 100644
--- a/usr/src/cmd/fm/modules/common/ses-log-transport/Makefile
+++ b/usr/src/cmd/fm/modules/common/ses-log-transport/Makefile
@@ -21,8 +21,8 @@
 #
 #Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
-   	
 MODULE = ses-log-transport
 CLASS = common
 SRCS = ses_log_transport.c
@@ -33,3 +33,6 @@ CFLAGS += $(INCS)
 LINTFLAGS += $(INCS)
 LDLIBS += -L$(ROOTLIB)/fm -ltopo -lseslog
 LDFLAGS += -R/usr/lib/fm
+
+# not linted
+SMATCH=off
diff --git a/usr/src/cmd/fmt/Makefile b/usr/src/cmd/fmt/Makefile
index cecd4e3c2a..0edd92e70c 100644
--- a/usr/src/cmd/fmt/Makefile
+++ b/usr/src/cmd/fmt/Makefile
@@ -23,7 +23,7 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fmt/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= fmt
 
@@ -37,6 +37,9 @@ LDLIBS += -lcmdutils
 CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/fold/Makefile b/usr/src/cmd/fold/Makefile
index 519c39a0e2..7f93bd355a 100644
--- a/usr/src/cmd/fold/Makefile
+++ b/usr/src/cmd/fold/Makefile
@@ -19,12 +19,10 @@
 #
 # CDDL HEADER END
 #
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= fold
 
@@ -32,9 +30,11 @@ include ../Makefile.cmd
 
 CFLAGS  += $(CCVERBOSE)
 
+SMOFF += index_overflow
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTPROG)
 
diff --git a/usr/src/cmd/format/Makefile b/usr/src/cmd/format/Makefile
index 34f25b7cc2..6c9f7781f7 100644
--- a/usr/src/cmd/format/Makefile
+++ b/usr/src/cmd/format/Makefile
@@ -23,7 +23,7 @@
 # Use is subject to license terms.
 #
 # Copyright 2015 Nexenta Systems, Inc. All rights reserved.
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= format
 
@@ -51,6 +51,9 @@ CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-unused-label
 CERRWARN += -_gcc=-Wno-clobbered
 
+# not linted
+SMATCH=off
+
 SRCS= $(OBJS:.o=.c)
 
 ROOTSYMLINK= $(ROOTETCPROG)
diff --git a/usr/src/cmd/fs.d/Makefile b/usr/src/cmd/fs.d/Makefile
index 8f8d752a94..6e692b98cf 100644
--- a/usr/src/cmd/fs.d/Makefile
+++ b/usr/src/cmd/fs.d/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2012, Joyent, Inc. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 # Copyright 2015 Nexenta Systems, Inc. All rights reserved.
 #
 
@@ -88,6 +88,9 @@ CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 $(DFPROG) :=	LDLIBS += -lcmdutils
 $(SPPROG) :=	LDLIBS += -lkstat
 
diff --git a/usr/src/cmd/fs.d/autofs/Makefile b/usr/src/cmd/fs.d/autofs/Makefile
index 5fd524a0f8..c91673ad42 100644
--- a/usr/src/cmd/fs.d/autofs/Makefile
+++ b/usr/src/cmd/fs.d/autofs/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2015 RackTop Systems.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 FSTYPE=		autofs
@@ -98,6 +99,9 @@ CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 OBJS=		$(AUTOOBJS) $(MOUNTOBJS) $(TYPEOBJS) \
 		$(SHAREOBJS) $(UNSHAREOBJS)
 
diff --git a/usr/src/cmd/fs.d/hsfs/labelit/Makefile b/usr/src/cmd/fs.d/hsfs/labelit/Makefile
index fdf2c43912..4c96122b88 100644
--- a/usr/src/cmd/fs.d/hsfs/labelit/Makefile
+++ b/usr/src/cmd/fs.d/hsfs/labelit/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		hsfs
 LIBPROG=	labelit
@@ -33,6 +34,9 @@ CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-unused-variable
 
+# not linted
+SMATCH=off
+
 lint := PROG = $(LIBPROG)
 
 lint:	lint_PROG
diff --git a/usr/src/cmd/fs.d/hsfs/mount/Makefile b/usr/src/cmd/fs.d/hsfs/mount/Makefile
index 9afcfc72f1..307f3dfa61 100644
--- a/usr/src/cmd/fs.d/hsfs/mount/Makefile
+++ b/usr/src/cmd/fs.d/hsfs/mount/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		hsfs
 LIBPROG=	mount
@@ -40,3 +41,6 @@ include		../../Makefile.mount
 include		../../Makefile.mount.targ
 
 CERRWARN +=	-_gcc=-Wno-unused-variable
+
+# not linted
+SMATCH=off
diff --git a/usr/src/cmd/fs.d/nfs/clear_locks/Makefile b/usr/src/cmd/fs.d/nfs/clear_locks/Makefile
index 0d08fe841c..804e784d08 100644
--- a/usr/src/cmd/fs.d/nfs/clear_locks/Makefile
+++ b/usr/src/cmd/fs.d/nfs/clear_locks/Makefile
@@ -20,11 +20,10 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= clear_locks
 
@@ -52,9 +51,12 @@ $(POFILE):      clear_locks.c
 
 CFLAGS		+=	$(CCVERBOSE)
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTUSRSBINPROG)
 
diff --git a/usr/src/cmd/fs.d/nfs/dfmounts/Makefile b/usr/src/cmd/fs.d/nfs/dfmounts/Makefile
index bd6ae76dd7..35b51671b0 100644
--- a/usr/src/cmd/fs.d/nfs/dfmounts/Makefile
+++ b/usr/src/cmd/fs.d/nfs/dfmounts/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		nfs
 LIBPROG=	dfmounts
@@ -43,6 +44,9 @@ LDLIBS +=	-lrpcsvc -lnsl
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# unknown type for func
+SMATCH =	off
+
 $(LIBPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 		$(POST_PROCESS)
diff --git a/usr/src/cmd/fs.d/nfs/dfshares/Makefile b/usr/src/cmd/fs.d/nfs/dfshares/Makefile
index ffda5d11cb..b86545d9e5 100644
--- a/usr/src/cmd/fs.d/nfs/dfshares/Makefile
+++ b/usr/src/cmd/fs.d/nfs/dfshares/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		nfs
 LIBPROG=	dfshares
@@ -37,6 +38,10 @@ CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
+
 $(LIBPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 		$(POST_PROCESS)
diff --git a/usr/src/cmd/fs.d/nfs/lockd/Makefile b/usr/src/cmd/fs.d/nfs/lockd/Makefile
index 19c459d9f5..e013de8aaa 100644
--- a/usr/src/cmd/fs.d/nfs/lockd/Makefile
+++ b/usr/src/cmd/fs.d/nfs/lockd/Makefile
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 FSTYPE	  =	nfs
@@ -45,6 +46,10 @@ CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
+
 $(TYPEPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 		$(POST_PROCESS)
diff --git a/usr/src/cmd/fs.d/nfs/mount/Makefile b/usr/src/cmd/fs.d/nfs/mount/Makefile
index e9e55aac78..c461949514 100644
--- a/usr/src/cmd/fs.d/nfs/mount/Makefile
+++ b/usr/src/cmd/fs.d/nfs/mount/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2017, Joyent, Inc. All rights reserved.
+# Copyright 2018, Joyent, Inc. All rights reserved.
 #
 # cmd/fs.d/nfs/mount/Makefile
 
@@ -43,6 +43,9 @@ CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-address
 CERRWARN += -_gcc=-Wno-unused-function
 
+# unknown type for func
+SMATCH=off
+
 #
 # Message catalog
 #
diff --git a/usr/src/cmd/fs.d/nfs/mountd/Makefile b/usr/src/cmd/fs.d/nfs/mountd/Makefile
index eca0a82911..36d3d4bca4 100644
--- a/usr/src/cmd/fs.d/nfs/mountd/Makefile
+++ b/usr/src/cmd/fs.d/nfs/mountd/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE	  =	nfs
 TYPEPROG  =	mountd
@@ -44,6 +45,9 @@ CPPFLAGS +=	-D_REENTRANT -I../lib
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-switch
 
+# not linted
+SMATCH=off
+
 $(TYPEPROG):	$(OBJS)
 		$(COMPILE.d) -s $(DSRC) -o $(DOBJ) $(OBJS)
 		$(LINK.c) -o $@ $(DOBJ) $(OBJS) $(LDLIBS)
diff --git a/usr/src/cmd/fs.d/nfs/nfs4cbd/Makefile b/usr/src/cmd/fs.d/nfs/nfs4cbd/Makefile
index 4c6f4dca16..9743af5165 100644
--- a/usr/src/cmd/fs.d/nfs/nfs4cbd/Makefile
+++ b/usr/src/cmd/fs.d/nfs/nfs4cbd/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		nfs
 TYPEPROG=	nfs4cbd
@@ -40,6 +41,9 @@ CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-extra
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all:	$(TYPEPROG)
diff --git a/usr/src/cmd/fs.d/nfs/nfsd/Makefile b/usr/src/cmd/fs.d/nfs/nfsd/Makefile
index 90a77dcbef..384d6a0c66 100644
--- a/usr/src/cmd/fs.d/nfs/nfsd/Makefile
+++ b/usr/src/cmd/fs.d/nfs/nfsd/Makefile
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		nfs
 TYPEPROG=	nfsd
@@ -42,6 +42,9 @@ CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-extra
 
+# not linted
+SMATCH=off
+
 $(TYPEPROG):	$(OBJS)
 		$(CC) -o $@ $(OBJS) $(LDFLAGS) $(LDLIBS)
 		$(POST_PROCESS)
diff --git a/usr/src/cmd/fs.d/nfs/nfslog/Makefile b/usr/src/cmd/fs.d/nfs/nfslog/Makefile
index 243574f744..7b2763a8d2 100644
--- a/usr/src/cmd/fs.d/nfs/nfslog/Makefile
+++ b/usr/src/cmd/fs.d/nfs/nfslog/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		nfs
 TYPEPROG=	nfslogd
@@ -42,6 +43,10 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-type-limits
+
+# not linted
+SMATCH=off
+
 CPPFLAGS += 	-D_FILE_OFFSET_BITS=64
 
 #
diff --git a/usr/src/cmd/fs.d/nfs/nfsmapid/Makefile b/usr/src/cmd/fs.d/nfs/nfsmapid/Makefile
index 6afd2bb495..5f0af9ef89 100644
--- a/usr/src/cmd/fs.d/nfs/nfsmapid/Makefile
+++ b/usr/src/cmd/fs.d/nfs/nfsmapid/Makefile
@@ -22,6 +22,8 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+
 
 FSTYPE	  =	nfs
 TYPEPROG  =	nfsmapid
@@ -44,6 +46,9 @@ CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 all:		$(TYPEPROG) $(TESTPROG)
 
 $(TYPEPROG):	$(OBJS) $(DSRC)
diff --git a/usr/src/cmd/fs.d/nfs/nfsref/Makefile b/usr/src/cmd/fs.d/nfs/nfsref/Makefile
index 9f5b8e73a3..749789dc68 100644
--- a/usr/src/cmd/fs.d/nfs/nfsref/Makefile
+++ b/usr/src/cmd/fs.d/nfs/nfsref/Makefile
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fs.d/nfs/nfsref/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		nfsref
 
@@ -36,6 +36,9 @@ SRCS=	nfsref.c
 
 CERRWARN += -_gcc=-Wno-unused-variable
 
+# not linted
+SMATCH=off
+
 LDLIBS += -lreparse -lnvpair -lnsl -lumem
 
 $(PROG):	$(OBJS)
diff --git a/usr/src/cmd/fs.d/nfs/nfsstat/Makefile b/usr/src/cmd/fs.d/nfs/nfsstat/Makefile
index 1fe48838f6..1b8dc8c9e6 100644
--- a/usr/src/cmd/fs.d/nfs/nfsstat/Makefile
+++ b/usr/src/cmd/fs.d/nfs/nfsstat/Makefile
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fs.d/nfs/nfsstat/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		nfsstat
 
@@ -42,6 +42,10 @@ OBJS += $(STAT_COMMON_OBJS)
 
 CPPFLAGS += -I$(STATCOMMONDIR)
 CERRWARN += -_gcc=-Wno-parentheses
+
+# not linted
+SMATCH=off
+
 LDLIBS += -lkstat -lnsl
 
 $(PROG):	$(OBJS)
diff --git a/usr/src/cmd/fs.d/nfs/rp_basic/Makefile.com b/usr/src/cmd/fs.d/nfs/rp_basic/Makefile.com
index 85567a3537..282067be42 100644
--- a/usr/src/cmd/fs.d/nfs/rp_basic/Makefile.com
+++ b/usr/src/cmd/fs.d/nfs/rp_basic/Makefile.com
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libnfs_basic.a
 VERS =		.1
@@ -44,6 +45,9 @@ LDLIBS +=	-lc -lnsl
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT -I$(SRC)/cmd/fs.d/nfs/lib
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/cmd/fs.d/nfs/rquotad/Makefile b/usr/src/cmd/fs.d/nfs/rquotad/Makefile
index e75afe3a9b..8a450f5c35 100644
--- a/usr/src/cmd/fs.d/nfs/rquotad/Makefile
+++ b/usr/src/cmd/fs.d/nfs/rquotad/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		nfs
 TYPEPROG=	rquotad
@@ -38,6 +39,9 @@ CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-unused-variable
 LDLIBS += -lnsl
 
+# unknown type for func
+SMATCH=off
+
 $(TYPEPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(LDLIBS) $(OBJS)
 		$(POST_PROCESS)
diff --git a/usr/src/cmd/fs.d/nfs/showmount/Makefile b/usr/src/cmd/fs.d/nfs/showmount/Makefile
index 7974fd5cdc..527c776481 100644
--- a/usr/src/cmd/fs.d/nfs/showmount/Makefile
+++ b/usr/src/cmd/fs.d/nfs/showmount/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		nfs
 LIBPROG=	showmount
@@ -47,6 +48,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 $(LIBPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 		$(POST_PROCESS)
diff --git a/usr/src/cmd/fs.d/nfs/statd/Makefile b/usr/src/cmd/fs.d/nfs/statd/Makefile
index ad7559a035..c64bbb71ca 100644
--- a/usr/src/cmd/fs.d/nfs/statd/Makefile
+++ b/usr/src/cmd/fs.d/nfs/statd/Makefile
@@ -30,6 +30,7 @@
 #
 # Copyright (c) 2016 by Delphix. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		nfs
 TYPEPROG=	statd
@@ -43,6 +44,9 @@ CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LOCAL=		sm_svc.o sm_proc.o sm_statd.o
 OBJS=		$(LOCAL) selfcheck.o daemon.o smfcfg.o
 
diff --git a/usr/src/cmd/fs.d/nfs/tests/Makefile b/usr/src/cmd/fs.d/nfs/tests/Makefile
index 1229b37f3e..329c9ca0b6 100644
--- a/usr/src/cmd/fs.d/nfs/tests/Makefile
+++ b/usr/src/cmd/fs.d/nfs/tests/Makefile
@@ -23,7 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fs.d/nfs/tests/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		nfs
 LIBPROG=	test_svc_tp_create
@@ -35,6 +35,9 @@ SRCS=		$(LIBPROG).c
 
 CFLAGS += $(CCVERBOSE)
 
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lnsl -lsocket
 
 # message catalog
diff --git a/usr/src/cmd/fs.d/smbclnt/smbiod-svc/Makefile b/usr/src/cmd/fs.d/smbclnt/smbiod-svc/Makefile
index a5dbf68bd9..90a7778386 100644
--- a/usr/src/cmd/fs.d/smbclnt/smbiod-svc/Makefile
+++ b/usr/src/cmd/fs.d/smbclnt/smbiod-svc/Makefile
@@ -22,10 +22,7 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
-
-#
-# cmd/fs.d/smbclnt/smbiod-svc/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		smbfs
 TYPEPROG=	smbiod-svc
@@ -42,6 +39,9 @@ CSTD= $(CSTD_GNU99)
 CPPFLAGS += -I$(SRC)/lib/libsmbfs \
 	-I$(SRC)/uts/common/smbclnt -I$(SRC)/uts/common
 
+# not linted
+SMATCH=off
+
 # Debugging
 ${NOT_RELEASE_BUILD} CPPFLAGS += -DDEBUG
 
diff --git a/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile b/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile
index 7acbf30f86..0b1f468a2b 100644
--- a/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile
+++ b/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile
@@ -21,6 +21,7 @@
 
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 #
@@ -39,13 +40,14 @@ POFILE=	$(TYPEPROG).po
 CFLAGS += $(CCVERBOSE)
 CSTD= $(CSTD_GNU99)
 
-# This is a multi-thread program but Nevada
-# no longer needs -lthread
 LDLIBS += -lsmbfs -lumem
 
 CPPFLAGS += -I$(SRC)/lib/libsmbfs \
 	-I$(SRC)/uts/common/smbclnt -I$(SRC)/uts/common
 
+# not linted
+SMATCH=off
+
 # Debugging
 ${NOT_RELEASE_BUILD} CPPFLAGS += -DDEBUG
 
diff --git a/usr/src/cmd/fs.d/smbclnt/smbutil/Makefile b/usr/src/cmd/fs.d/smbclnt/smbutil/Makefile
index f15dcc8f67..5794a07956 100644
--- a/usr/src/cmd/fs.d/smbclnt/smbutil/Makefile
+++ b/usr/src/cmd/fs.d/smbclnt/smbutil/Makefile
@@ -24,6 +24,7 @@
 # Use is subject to license terms.
 #
 # Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 #
@@ -52,6 +53,9 @@ LDLIBS += -lmlrpc -lsmbfs -lnsl
 CPPFLAGS += -I$(SRC)/lib/libsmbfs \
 	-I$(SRC)/uts/common/smbclnt -I$(SRC)/uts/common
 
+# not linted
+SMATCH=off
+
 # Debugging
 ${NOT_RELEASE_BUILD} CPPFLAGS += -DDEBUG
 
diff --git a/usr/src/cmd/fs.d/udfs/fsck/Makefile b/usr/src/cmd/fs.d/udfs/fsck/Makefile
index f3870fba38..a5c12a6baa 100644
--- a/usr/src/cmd/fs.d/udfs/fsck/Makefile
+++ b/usr/src/cmd/fs.d/udfs/fsck/Makefile
@@ -23,6 +23,7 @@
 # Copyright (c) 1999 by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		udfs
 LIBPROG=	fsck
@@ -40,6 +41,9 @@ UDFSOBJS=	udfslib.o
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 OBJS=		$(FSCKOBJS) $(UDFSOBJS)
 SRCS=		$(FSCKSRCS) $(UDFSSRCS) ../mkfs/udfslib.c
 
diff --git a/usr/src/cmd/fs.d/udfs/fsdb/Makefile b/usr/src/cmd/fs.d/udfs/fsdb/Makefile
index 3c8ea7cc87..5c17537f20 100644
--- a/usr/src/cmd/fs.d/udfs/fsdb/Makefile
+++ b/usr/src/cmd/fs.d/udfs/fsdb/Makefile
@@ -22,7 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# Copyright 2017, Joyent Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 FSTYPE=		udfs
@@ -51,6 +51,9 @@ CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-value
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 SRCS=	fsdb.c ud_lib.c
 
 fsdb : fsdb_yacc.o fsdb_lex.o ud_lib.o fsdb.o $(MAPFILES)
diff --git a/usr/src/cmd/fs.d/udfs/mkfs/Makefile b/usr/src/cmd/fs.d/udfs/mkfs/Makefile
index e235f01963..078f90c5fb 100644
--- a/usr/src/cmd/fs.d/udfs/mkfs/Makefile
+++ b/usr/src/cmd/fs.d/udfs/mkfs/Makefile
@@ -23,6 +23,7 @@
 # Copyright (c) 1999,2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		udfs
 LIBPROG=	mkfs
@@ -48,6 +49,9 @@ UDFSOBJS=
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 OBJS=		$(MKFSOBJS) $(UDFSOBJS)
 SRCS=		$(OBJS:%.o=%.c)
 
diff --git a/usr/src/cmd/fs.d/ufs/df/Makefile b/usr/src/cmd/fs.d/ufs/df/Makefile
index fc76d7ca8e..a59dd5de7d 100644
--- a/usr/src/cmd/fs.d/ufs/df/Makefile
+++ b/usr/src/cmd/fs.d/ufs/df/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	df
@@ -40,6 +41,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 # for messaging catalogue file
 #
 POFILE= df.po
diff --git a/usr/src/cmd/fs.d/ufs/edquota/Makefile b/usr/src/cmd/fs.d/ufs/edquota/Makefile
index 1f29704147..a33c171584 100644
--- a/usr/src/cmd/fs.d/ufs/edquota/Makefile
+++ b/usr/src/cmd/fs.d/ufs/edquota/Makefile
@@ -23,6 +23,7 @@
 # Copyright (c) 1989,1996 by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	edquota
@@ -37,5 +38,8 @@ CPPFLAGS +=	-D_LARGEFILE64_SOURCE
 CERRWARN +=	-_gcc=-Wno-parentheses
 lint:		lint_PROG
 
+# not linted
+SMATCH=off
+
 $(ROOTUSRSBIN)/$(LIBPROG):
 		-$(RM) $@; $(SYMLINK) $(LINKVALUE) $@
diff --git a/usr/src/cmd/fs.d/ufs/ff/Makefile b/usr/src/cmd/fs.d/ufs/ff/Makefile
index 09c79c2688..a36af880e0 100644
--- a/usr/src/cmd/fs.d/ufs/ff/Makefile
+++ b/usr/src/cmd/fs.d/ufs/ff/Makefile
@@ -23,6 +23,7 @@
 # Copyright (c) 1989,1996 by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	ff
@@ -41,6 +42,9 @@ CPPFLAGS +=	-D_LARGEFILE64_SOURCE
 
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 $(LIBPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 		$(POST_PROCESS)
diff --git a/usr/src/cmd/fs.d/ufs/fsck/Makefile b/usr/src/cmd/fs.d/ufs/fsck/Makefile
index 9562fdedb2..cc3bd8dd12 100644
--- a/usr/src/cmd/fs.d/ufs/fsck/Makefile
+++ b/usr/src/cmd/fs.d/ufs/fsck/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	fsck
@@ -51,6 +52,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 $(LIBPROG):	$(OBJS)
 		$(LINK.c) -o $@ $(OBJS) $(LDLIBS) $(CTFMERGE_HOOK)
 		$(POST_PROCESS)
diff --git a/usr/src/cmd/fs.d/ufs/fsdb/Makefile b/usr/src/cmd/fs.d/ufs/fsdb/Makefile
index 05dfa205dd..64527b4e5f 100644
--- a/usr/src/cmd/fs.d/ufs/fsdb/Makefile
+++ b/usr/src/cmd/fs.d/ufs/fsdb/Makefile
@@ -23,6 +23,7 @@
 # Copyright (c) 1989,2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	fsdb
@@ -37,6 +38,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 SRCS=	$(LIBPROG).c
 
 lint:	lint_SRCS
diff --git a/usr/src/cmd/fs.d/ufs/fssnap/Makefile b/usr/src/cmd/fs.d/ufs/fssnap/Makefile
index 155ad227e8..c1dfb654c2 100644
--- a/usr/src/cmd/fs.d/ufs/fssnap/Makefile
+++ b/usr/src/cmd/fs.d/ufs/fssnap/Makefile
@@ -21,8 +21,9 @@
 #
 #
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms. 
+# Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	fssnap
@@ -43,6 +44,10 @@ CERRWARN +=	-_gcc=-Wno-type-limits
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
+
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lkstat -ldevinfo
 
 # message catalog
diff --git a/usr/src/cmd/fs.d/ufs/labelit/Makefile b/usr/src/cmd/fs.d/ufs/labelit/Makefile
index 346d76baaf..d4747a5016 100644
--- a/usr/src/cmd/fs.d/ufs/labelit/Makefile
+++ b/usr/src/cmd/fs.d/ufs/labelit/Makefile
@@ -20,12 +20,10 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 1989,1996,2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-# cmd/fs.d/ufs/labelit/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	labelit
@@ -35,6 +33,9 @@ include		../../Makefile.fstype
 
 CPPFLAGS +=	-D_LARGEFILE64_SOURCE
 
+# not linted
+SMATCH=off
+
 lint :=		PROG=$(LIBPROG)
 
 lint:		lint_PROG
diff --git a/usr/src/cmd/fs.d/ufs/lockfs/Makefile b/usr/src/cmd/fs.d/ufs/lockfs/Makefile
index 0429ee74ce..9e1bdc9af5 100644
--- a/usr/src/cmd/fs.d/ufs/lockfs/Makefile
+++ b/usr/src/cmd/fs.d/ufs/lockfs/Makefile
@@ -20,12 +20,10 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 1991,1996,2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-# cmd/fs.d/ufs/lockfs/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	lockfs
@@ -38,6 +36,8 @@ include		../../Makefile.fstype
 
 CPPFLAGS +=	-D_LARGEFILE64_SOURCE
 
+SMOFF += all_func_returns
+
 lint:		lint_PROG
 
 $(ROOTUSRSBIN)/$(LIBPROG):
diff --git a/usr/src/cmd/fs.d/ufs/newfs/Makefile b/usr/src/cmd/fs.d/ufs/newfs/Makefile
index e740669879..82e10b3aaf 100644
--- a/usr/src/cmd/fs.d/ufs/newfs/Makefile
+++ b/usr/src/cmd/fs.d/ufs/newfs/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	newfs
@@ -38,6 +39,9 @@ LDLIBS += -ladm -lefi
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 OBJS=		$(LIBPROG).o $(FSLIB)
 SRCS=		$(LIBPROG).c $(FSLIBSRC)
 
diff --git a/usr/src/cmd/fs.d/ufs/quot/Makefile b/usr/src/cmd/fs.d/ufs/quot/Makefile
index d155cc0b8e..45ffe6b56c 100644
--- a/usr/src/cmd/fs.d/ufs/quot/Makefile
+++ b/usr/src/cmd/fs.d/ufs/quot/Makefile
@@ -20,12 +20,10 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fs.d/ufs/quot/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	quot
@@ -40,6 +38,9 @@ CPPFLAGS +=	-D_LARGEFILE64_SOURCE
 CFLAGS	+=	$(CCVERBOSE)
 LDLIBS	+=	-ladm
 
+# not linted
+SMATCH=off
+
 lint		:=	PROG= $(LIBPROG)
 
 lint:		lint_PROG
diff --git a/usr/src/cmd/fs.d/ufs/quota/Makefile b/usr/src/cmd/fs.d/ufs/quota/Makefile
index 3c2b6bc313..b737d263a7 100644
--- a/usr/src/cmd/fs.d/ufs/quota/Makefile
+++ b/usr/src/cmd/fs.d/ufs/quota/Makefile
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fs.d/ufs/quota/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	quota
@@ -43,6 +43,9 @@ CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 FILEMODE= 04555
 
 $(LIBPROG):	$(OBJS)
diff --git a/usr/src/cmd/fs.d/ufs/quotacheck/Makefile b/usr/src/cmd/fs.d/ufs/quotacheck/Makefile
index cb302325e4..35efa4536f 100644
--- a/usr/src/cmd/fs.d/ufs/quotacheck/Makefile
+++ b/usr/src/cmd/fs.d/ufs/quotacheck/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	quotacheck
@@ -42,6 +43,9 @@ SRCS=		$(OBJS:.o=.c)
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-type-limits
 
+# not linted
+SMATCH=off
+
 lint:		lint_PROG
 
 $(FSOBJS): $(FSSRCS)
diff --git a/usr/src/cmd/fs.d/ufs/quotaon/Makefile b/usr/src/cmd/fs.d/ufs/quotaon/Makefile
index 40949dd5d9..d558ce9149 100644
--- a/usr/src/cmd/fs.d/ufs/quotaon/Makefile
+++ b/usr/src/cmd/fs.d/ufs/quotaon/Makefile
@@ -22,7 +22,7 @@
 # Use is subject to license terms.
 # Copyright 2015 Nexenta Systems, Inc. All rights reserved.
 #
-# cmd/fs.d/ufs/quotaon/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	quotaon
@@ -43,6 +43,9 @@ CPPFLAGS +=	-D_LARGEFILE64_SOURCE
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 lint:		lint_PROG
 
 $(ROOTLIBFSTYPE)/$(QUOTAOFF):	$(ROOTLIBFSTYPE)/$(LIBPROG) 
diff --git a/usr/src/cmd/fs.d/ufs/repquota/Makefile b/usr/src/cmd/fs.d/ufs/repquota/Makefile
index 600ca6b373..4bb399e549 100644
--- a/usr/src/cmd/fs.d/ufs/repquota/Makefile
+++ b/usr/src/cmd/fs.d/ufs/repquota/Makefile
@@ -23,6 +23,7 @@
 # Copyright (c) 1989,1996 by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	repquota
@@ -38,6 +39,9 @@ CPPFLAGS +=	-D_LARGEFILE64_SOURCE
 CERRWARN +=	-_gcc=-Wno-type-limits
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 lint:		lint_PROG
 
 $(ROOTUSRSBIN)/$(LIBPROG):
diff --git a/usr/src/cmd/fs.d/ufs/tunefs/Makefile b/usr/src/cmd/fs.d/ufs/tunefs/Makefile
index 858ea7c3d3..ba6df6c8f5 100644
--- a/usr/src/cmd/fs.d/ufs/tunefs/Makefile
+++ b/usr/src/cmd/fs.d/ufs/tunefs/Makefile
@@ -23,6 +23,7 @@
 # Copyright (c) 1989,1996, by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	tunefs
@@ -39,6 +40,9 @@ CPPFLAGS +=	-D_LARGEFILE64_SOURCE
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 lint:		lint_PROG
 
 $(ROOTUSRSBIN)/$(LIBPROG):	FRC
diff --git a/usr/src/cmd/fs.d/ufs/volcopy/Makefile b/usr/src/cmd/fs.d/ufs/volcopy/Makefile
index 9da5b17da5..9e767c6561 100644
--- a/usr/src/cmd/fs.d/ufs/volcopy/Makefile
+++ b/usr/src/cmd/fs.d/ufs/volcopy/Makefile
@@ -23,6 +23,7 @@
 # Copyright 1989,2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 FSTYPE=		ufs
 LIBPROG=	volcopy
@@ -34,6 +35,9 @@ CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LDLIBS += 	-lmapmalloc
 
 # for messaging catalog
diff --git a/usr/src/cmd/fwflash/Makefile.com b/usr/src/cmd/fwflash/Makefile.com
index 59e2bcdb36..3a5d9c36a2 100644
--- a/usr/src/cmd/fwflash/Makefile.com
+++ b/usr/src/cmd/fwflash/Makefile.com
@@ -21,8 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/fwflash/Makefile.com
-#
+# Copyright (c) 2018, Joyent, Inc.
 #
 # common rules for $SRC/cmd/fwflash
 
@@ -30,6 +29,9 @@ CERRWARN +=		-_gcc=-Wno-parentheses
 CERRWARN +=		-_gcc=-Wno-uninitialized
 CERRWARN +=		-_gcc=-Wno-address
 
+# not linted
+SMATCH=off
+
 ROOTUSR=                $(ROOT)/usr
 ROOTUSRINCLD=		$(ROOTUSR)/include
 ROOTUSRINCLDFWFLASH=	$(ROOTUSRINCLD)/fwflash
diff --git a/usr/src/cmd/gencat/Makefile b/usr/src/cmd/gencat/Makefile
index f5ccbe0e45..0c35c6cf76 100644
--- a/usr/src/cmd/gencat/Makefile
+++ b/usr/src/cmd/gencat/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= gencat
 
@@ -33,6 +34,9 @@ include ../Makefile.cmd
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-unused-value
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG) 
diff --git a/usr/src/cmd/grpck/Makefile b/usr/src/cmd/grpck/Makefile
index 3a06b0d9cd..e140a3b7c7 100644
--- a/usr/src/cmd/grpck/Makefile
+++ b/usr/src/cmd/grpck/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1990 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= grpck
 
@@ -29,6 +30,9 @@ include ../Makefile.cmd
 
 CERRWARN += -_gcc=-Wno-unused-variable
 
+# not linted
+SMATCH=off
+
 RELUSRSBIN=	../usr/sbin
 ROOTSYMLINK=	$(ROOTETC)/$(PROG)
 
diff --git a/usr/src/cmd/gss/gsscred/Makefile b/usr/src/cmd/gss/gsscred/Makefile
index 84b70d0d32..7442907770 100644
--- a/usr/src/cmd/gss/gsscred/Makefile
+++ b/usr/src/cmd/gss/gsscred/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 SBINPROG = gsscred
 
@@ -46,9 +47,12 @@ ROOTBINPROG=		$(BINPROG:%=$(ROOTBIN)/%)
 
 COPTFLAG += $(XESS) $(INCDIRS) $(LIBPATH)
 
+# not linted
+SMATCH=off
+
 LDLIBS += -lgss
 
-$(GPROGS) := CPPFLAGS += -DSYSV -DSunOS=50 
+$(GPROGS) := CPPFLAGS += -DSYSV -DSunOS=50
 
 .KEEP_STATE:
 
diff --git a/usr/src/cmd/gss/gssd/Makefile b/usr/src/cmd/gss/gssd/Makefile
index 11d1a23494..cb03db28a1 100644
--- a/usr/src/cmd/gss/gssd/Makefile
+++ b/usr/src/cmd/gss/gssd/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 TESTPROG = gssdtest
 
@@ -37,7 +38,7 @@ GSSC_BASEOBJS = gssdtest.o gssd_release_name_and_type.o gssd_clnt_stubs.o \
 
 GD_OBJS	= gssd_svc.o
 GC_OBJS	= gssd_clnt.o
-G_OBJS	= gssd_xdr.o 
+G_OBJS	= gssd_xdr.o
 GSSDOBJS = $(GSSD_BASEOBJS) $(GD_OBJS) $(G_OBJS)
 GSSCOBJS = $(GSSC_BASEOBJS) $(GC_OBJS) $(G_OBJS)
 
@@ -68,13 +69,16 @@ ROOTLIB=	$(ROOT)/usr/lib/gss
 DIRS=	$(ROOTLIB)
 
 CPPFLAGS += -I$(SRC)/uts/common/gssapi/include
-COPTFLAG += $(XESS) #-I$(KINCDIR) 
+COPTFLAG += $(XESS) #-I$(KINCDIR)
 
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LDLIBS += -lgss -lnsl
 
 gssd :=	MAPFILES = $(MAPFILE.INT) $(MAPFILE.NGB)
diff --git a/usr/src/cmd/iconv/Makefile b/usr/src/cmd/iconv/Makefile
index f4fd3c3010..4c776b88a0 100644
--- a/usr/src/cmd/iconv/Makefile
+++ b/usr/src/cmd/iconv/Makefile
@@ -11,7 +11,7 @@
 
 #
 # Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
-# Copyright 2017 Joyent Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG=iconv
@@ -31,6 +31,9 @@ $(RELEASE_BUILD) CPPFLAGS += -DNDEBUG
 
 CERRWARN +=	-_gcc=-Wno-unused-label
 
+# not linted
+SMATCH=off
+
 CLEANFILES	= $(OBJS) parser.tab.c parser.tab.h
 CLOBBERFILES	= $(PROG) $(POFILE)
 PIFILES		= $(OBJS:%.o=%.i)
diff --git a/usr/src/cmd/idmap/idmap/Makefile b/usr/src/cmd/idmap/idmap/Makefile
index 17e3e1574d..e8d87e4d9c 100644
--- a/usr/src/cmd/idmap/idmap/Makefile
+++ b/usr/src/cmd/idmap/idmap/Makefile
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		idmap
 CLIENTOBJS =	idmap.o idmap_engine.o namemaps.o
@@ -41,6 +42,9 @@ CERRWARN +=	-_gcc=-Wno-unused-function
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-address
 
+# not linted
+SMATCH=off
+
 POFILE = 	$(PROG)_all.po
 LDLIBS +=	-lidmap -ladutils -lsldap -lldap
 FILEMODE =	0555
diff --git a/usr/src/cmd/idmap/idmapd/Makefile b/usr/src/cmd/idmap/idmapd/Makefile
index b0d03278ca..4b2c59b59d 100644
--- a/usr/src/cmd/idmap/idmapd/Makefile
+++ b/usr/src/cmd/idmap/idmapd/Makefile
@@ -22,6 +22,7 @@
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		idmapd
 MANIFEST =	idmap.xml
@@ -63,6 +64,9 @@ CERRWARN +=	-_gcc=-Wno-type-limits
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 TEXT_DOMAIN =	SUNW_OST_OSLIB
 XGETTEXT =	$(GNUXGETTEXT)
 XGETFLAGS =	--foreign-user --strict -n -E --width=72 \
diff --git a/usr/src/cmd/init/Makefile b/usr/src/cmd/init/Makefile
index b17dd20100..9d70fa9539 100644
--- a/usr/src/cmd/init/Makefile
+++ b/usr/src/cmd/init/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= init 
 OBJS= init.o
@@ -40,6 +41,9 @@ CERRWARN += -_gcc=-Wno-uninitialized
 LINTFLAGS += -erroff=E_NAME_USED_NOT_DEF2
 CLOBBERFILES= $(STATIC)
 
+# needs work
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(ROOTFS_PROG)
diff --git a/usr/src/cmd/ipf/Makefile.ipf b/usr/src/cmd/ipf/Makefile.ipf
index fa151be780..f960a477a2 100644
--- a/usr/src/cmd/ipf/Makefile.ipf
+++ b/usr/src/cmd/ipf/Makefile.ipf
@@ -22,8 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#cmd/ipf/Makefile.ipf
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 
 LIBIPF=		../../lib/$(MACH)/libipf.a
@@ -41,3 +40,7 @@ CERRWARN	+= -_gcc=-Wno-unused-label
 CERRWARN	+= -_gcc=-Wno-parentheses
 CERRWARN	+= -_gcc=-Wno-unused-function
 CERRWARN	+= -_gcc=-Wno-empty-body
+
+# not linted
+SMATCH=off
+
diff --git a/usr/src/cmd/iscsiadm/Makefile b/usr/src/cmd/iscsiadm/Makefile
index 0249e9d347..f515f892c5 100644
--- a/usr/src/cmd/iscsiadm/Makefile
+++ b/usr/src/cmd/iscsiadm/Makefile
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG = iscsiadm
 OBJS = cmdparse.o sun_ima.o iscsiadm_main.o
@@ -43,6 +43,9 @@ CERRWARN += -_gcc=-Wno-unused-function
 CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 FILEMODE= 0555
 
 .KEEP_STATE:
diff --git a/usr/src/cmd/isns/isnsadm/Makefile b/usr/src/cmd/isns/isnsadm/Makefile
index e121b27ff0..e40079b4ef 100644
--- a/usr/src/cmd/isns/isnsadm/Makefile
+++ b/usr/src/cmd/isns/isnsadm/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG = isnsadm
 SRCS = cmdparse.c isnsadm.c isnsadm_msg.c
@@ -40,6 +41,9 @@ LINTFLAGS += -xerroff=E_BAD_FORMAT_STR2
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/isns/isnsd/Makefile b/usr/src/cmd/isns/isnsd/Makefile
index f104960808..0cfabc0cfb 100644
--- a/usr/src/cmd/isns/isnsd/Makefile
+++ b/usr/src/cmd/isns/isnsd/Makefile
@@ -25,7 +25,7 @@
 
 #
 # Copyright (c) 2012 by Delphix. All rights reserved.
-# Copyright 2017 Joyent, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG = isns
@@ -64,6 +64,9 @@ CERRWARN += -_gcc=-Wno-ignored-qualifiers
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 CLOBBERFILES += $(DTRACE_HEADER)
 
 obj.o := CERRWARN += -erroff=E_CONST_OBJ_SHOULD_HAVE_INITIZR
diff --git a/usr/src/cmd/keyserv/Makefile b/usr/src/cmd/keyserv/Makefile
index 0c26bd4cca..f787415ab9 100644
--- a/usr/src/cmd/keyserv/Makefile
+++ b/usr/src/cmd/keyserv/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 SBINPROG = keyserv newkey
 BINPROG	= keylogout keylogin domainname chkey
@@ -74,6 +75,9 @@ CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-address
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lnsl
 chkey :=	LDLIBS += -lsldap
 keyserv :=	LDLIBS += -lmp
diff --git a/usr/src/cmd/krb5/kadmin/cli/Makefile b/usr/src/cmd/krb5/kadmin/cli/Makefile
index ea7dc52f6d..e74a5ce3ff 100644
--- a/usr/src/cmd/krb5/kadmin/cli/Makefile
+++ b/usr/src/cmd/krb5/kadmin/cli/Makefile
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= kadmin kadmin.local
 SHFILES= k5srvutil
@@ -37,6 +38,8 @@ CERRWARN += -_gcc=-Wno-unused-function
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-unused-variable
 
+SMATCH=off
+
 COPTFLAG += $(XESS) #-I$(KINCDIR) 
 
 SHAREDLIBS = -lmech_krb5 -lss
diff --git a/usr/src/cmd/krb5/kadmin/dbutil/Makefile b/usr/src/cmd/krb5/kadmin/dbutil/Makefile
index 9590430b9c..dcf80c679c 100644
--- a/usr/src/cmd/krb5/kadmin/dbutil/Makefile
+++ b/usr/src/cmd/krb5/kadmin/dbutil/Makefile
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= kdb5_util
 
@@ -40,6 +41,9 @@ CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-unused-function
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 LDFLAGS += $(KRUNPATH) $(KERBRUNPATH)
 LDLIBS += -L $(ROOT_KLIBDIR) -L $(KRB5LIB) -lkadm5srv -lkdb \
 	-lmech_krb5 -lnsl
diff --git a/usr/src/cmd/krb5/kadmin/kclient/Makefile b/usr/src/cmd/krb5/kadmin/kclient/Makefile
index a5faf8b1ea..bf766992c3 100644
--- a/usr/src/cmd/krb5/kadmin/kclient/Makefile
+++ b/usr/src/cmd/krb5/kadmin/kclient/Makefile
@@ -22,6 +22,7 @@
 #
 # Makefile for Kerberos client-install utility.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		ksetpw \
 		kdyndns \
@@ -64,6 +65,9 @@ CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 ksetpw:=	LDFLAGS += $(KRUNPATH)
 kdyndns:=	LDFLAGS += -R/usr/lib/smbsrv
 ksmb:=		LDFLAGS += -R/usr/lib/smbsrv
diff --git a/usr/src/cmd/krb5/kadmin/kdcmgr/Makefile b/usr/src/cmd/krb5/kadmin/kdcmgr/Makefile
index 3e5e1e4d86..47bbc0ab43 100644
--- a/usr/src/cmd/krb5/kadmin/kdcmgr/Makefile
+++ b/usr/src/cmd/krb5/kadmin/kdcmgr/Makefile
@@ -21,6 +21,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	kdcmgr
 KLPROG=	klookup
@@ -37,6 +38,9 @@ POFILE=		$(SSRCS:%.sh=%.po)
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LDLIBS	+=	-lresolv -lnsl
 
 CLOBBERFILES +=	$(KLPROG)
diff --git a/usr/src/cmd/krb5/kadmin/kpasswd/Makefile b/usr/src/cmd/krb5/kadmin/kpasswd/Makefile
index 7ace844269..7e8a5d970d 100644
--- a/usr/src/cmd/krb5/kadmin/kpasswd/Makefile
+++ b/usr/src/cmd/krb5/kadmin/kpasswd/Makefile
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= kpasswd
 
@@ -35,6 +36,9 @@ CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 LDFLAGS += $(KRUNPATH) $(KERBRUNPATH)
 LDLIBS += -L $(KRB5LIBDIR)
 LDLIBS += $(KMECHLIB) $(KCLNTLIB)
diff --git a/usr/src/cmd/krb5/kadmin/ktutil/Makefile b/usr/src/cmd/krb5/kadmin/ktutil/Makefile
index 652f88110c..06ae6585b3 100644
--- a/usr/src/cmd/krb5/kadmin/ktutil/Makefile
+++ b/usr/src/cmd/krb5/kadmin/ktutil/Makefile
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= ktutil
 
@@ -28,6 +29,9 @@ COPTFLAG += $(XESS) #-I$(KINCDIR)
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 LDFLAGS += $(KRUNPATH) $(KERBRUNPATH)
 LDLIBS += $(KMECHLIB) $(ROOT)$(KERBLIBDIR)/libss.so
 
diff --git a/usr/src/cmd/krb5/kadmin/server/Makefile b/usr/src/cmd/krb5/kadmin/server/Makefile
index 6e8e7c25f9..9bb3366ffc 100644
--- a/usr/src/cmd/krb5/kadmin/server/Makefile
+++ b/usr/src/cmd/krb5/kadmin/server/Makefile
@@ -2,6 +2,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= kadmind
 MANIFEST=	kadmin.xml
@@ -47,6 +48,9 @@ CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 LDFLAGS += $(KRUNPATH) $(KERBRUNPATH)
 LDLIBS += -lgss -L$(KRB5LIB) \
 	-lmech_krb5 -lkadm5srv -lkdb -lnsl -lresolv -lbsm -lpam -lsocket
diff --git a/usr/src/cmd/krb5/kdestroy/Makefile b/usr/src/cmd/krb5/kdestroy/Makefile
index fe8cb0f058..7040c504b9 100644
--- a/usr/src/cmd/krb5/kdestroy/Makefile
+++ b/usr/src/cmd/krb5/kdestroy/Makefile
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= kdestroy
 
@@ -15,6 +16,9 @@ include $(SRC)/lib/gss_mechs/mech_krb5/Makefile.mech_krb5
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 POFILE = kdestroy.po 
 POFILES = generic.po 
 
diff --git a/usr/src/cmd/krb5/kinit/Makefile b/usr/src/cmd/krb5/kinit/Makefile
index 8aaaac2990..2d3327f269 100644
--- a/usr/src/cmd/krb5/kinit/Makefile
+++ b/usr/src/cmd/krb5/kinit/Makefile
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= kinit
 
@@ -17,6 +18,9 @@ CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-unused-function
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 POFILE = kinit.po
 POFILES = generic.po
 
diff --git a/usr/src/cmd/krb5/klist/Makefile b/usr/src/cmd/krb5/klist/Makefile
index 4485ade155..057f73e07d 100644
--- a/usr/src/cmd/krb5/klist/Makefile
+++ b/usr/src/cmd/krb5/klist/Makefile
@@ -2,7 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= klist
 
@@ -28,6 +28,9 @@ LDFLAGS += $(KRUNPATH)
 LDLIBS += $(KMECHLIB)
 CERRWARN += -_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 $(GPROGS) := CPPFLAGS += -DSYSV -DSunOS=50 
 
 .KEEP_STATE:
diff --git a/usr/src/cmd/krb5/kproplog/Makefile b/usr/src/cmd/krb5/kproplog/Makefile
index 6cade7d181..1672cdbf85 100644
--- a/usr/src/cmd/krb5/kproplog/Makefile
+++ b/usr/src/cmd/krb5/kproplog/Makefile
@@ -2,6 +2,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG		=	kproplog
 
@@ -37,6 +38,9 @@ CERRWARN	+=	-_gcc=-Wno-unused-variable
 CERRWARN	+=	-_gcc=-Wno-unused-function
 CERRWARN	+=	-_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 all:		$(PROG)
 
 $(PROG):	$(OBJS) $(DERIVED_OBJS)
diff --git a/usr/src/cmd/krb5/krb5kdc/Makefile b/usr/src/cmd/krb5/krb5kdc/Makefile
index ac3e00b0f3..95cad3e081 100644
--- a/usr/src/cmd/krb5/krb5kdc/Makefile
+++ b/usr/src/cmd/krb5/krb5kdc/Makefile
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= krb5kdc
 MANIFEST=	krb5kdc.xml
@@ -56,6 +57,9 @@ CERRWARN += -_gcc=-Wno-type-limits
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 LDFLAGS += $(KRUNPATH) $(KERBRUNPATH)
 LDLIBS += -L$(ROOT_KLIBDIR) -L$(KRB5LIB) \
 	  -lmech_krb5 -lkdb -lkadm5srv -lnsl -lsocket -lbsm -lc
diff --git a/usr/src/cmd/krb5/kwarn/Makefile b/usr/src/cmd/krb5/kwarn/Makefile
index 7dc7c8dc7a..977631646e 100644
--- a/usr/src/cmd/krb5/kwarn/Makefile
+++ b/usr/src/cmd/krb5/kwarn/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 TESTPROG = kwarndtest 
 
@@ -56,6 +57,9 @@ CERRWARN +=	-_gcc=-Wno-unused-function
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 CPPFLAGS += -I../../lib/gss_mechs/mech_krb5/include \
                  -I$(SRC)/lib/gss_mechs/mech_krb5 \
                  -I$(SRC)/lib/gss_mechs/mech_krb5/include \
diff --git a/usr/src/cmd/krb5/ldap_util/Makefile b/usr/src/cmd/krb5/ldap_util/Makefile
index 261ef5e89e..bdcc3197b0 100644
--- a/usr/src/cmd/krb5/ldap_util/Makefile
+++ b/usr/src/cmd/krb5/ldap_util/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= kdb5_ldap_util
 
@@ -65,6 +66,9 @@ CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-unused-function
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 LDFLAGS += $(KRUNPATH) $(KERBRUNPATH)
 LDLIBS += -L $(ROOT_KLIBDIR) -L $(KRB5LIB) -lkadm5srv -lkdb -lkdb_ldap \
 	-lmech_krb5
diff --git a/usr/src/cmd/krb5/slave/Makefile b/usr/src/cmd/krb5/slave/Makefile
index ffae1e2c8b..5b29e30459 100644
--- a/usr/src/cmd/krb5/slave/Makefile
+++ b/usr/src/cmd/krb5/slave/Makefile
@@ -2,6 +2,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG1=kprop
 PROG2=kpropd
@@ -63,6 +64,9 @@ CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-value
 CERRWARN +=	-_gcc=-Wno-address
 
+# not linted
+SMATCH=off
+
 LDFLAGS +=	$(KRUNPATH) $(KERBRUNPATH)
 LDLIBS +=	-lmech_krb5 -lsocket
 $(PROG1) :=	LDLIBS += -L$(KRB5LIB) -lkadm5srv
diff --git a/usr/src/cmd/ksh/Makefile.com b/usr/src/cmd/ksh/Makefile.com
index e5615cb407..b1aef300da 100644
--- a/usr/src/cmd/ksh/Makefile.com
+++ b/usr/src/cmd/ksh/Makefile.com
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 SHELL=/usr/bin/ksh93
 
@@ -64,6 +65,9 @@ CFLAGS64 += \
 pmain.o	:= CERRWARN += -_gcc=-Wno-implicit-function-declaration
 pmain.o	:= CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 %.o:	$(LIBSHELLSRC)/%.c
diff --git a/usr/src/cmd/ksh/builtins/Makefile b/usr/src/cmd/ksh/builtins/Makefile
index e4c0e8aa7a..1033c6cdd3 100644
--- a/usr/src/cmd/ksh/builtins/Makefile
+++ b/usr/src/cmd/ksh/builtins/Makefile
@@ -23,10 +23,10 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-
-#
 # Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
+#
 
 PROG= alias
 ALIASPROG= \
@@ -93,6 +93,9 @@ $(SPARC_BLD)include ../../Makefile.cmd.64
 FILEMODE= 555
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/last/Makefile b/usr/src/cmd/last/Makefile
index 82cbb69386..129063ab1d 100644
--- a/usr/src/cmd/last/Makefile
+++ b/usr/src/cmd/last/Makefile
@@ -21,8 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/last/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= last
 UTMPS= wtmpx
@@ -33,6 +32,9 @@ ETCTOVARADM= ../var/adm
 
 include ../Makefile.cmd
 
+# not linted
+SMATCH=off
+
 $(ROOTUTMPS):= FILEMODE= 644
 
 $(ROOTADM)/%: %
diff --git a/usr/src/cmd/ldap/Makefile.com b/usr/src/cmd/ldap/Makefile.com
index 33dd225325..ef207e6ffd 100644
--- a/usr/src/cmd/ldap/Makefile.com
+++ b/usr/src/cmd/ldap/Makefile.com
@@ -20,6 +20,7 @@
 #
 #
 # Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 # cmd/ldap/Makefile.com
 # Native LDAP II commands (makestyle clean).
@@ -89,6 +90,9 @@ CERRWARN +=	-_gcc=-Wno-unused-function
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 all:=           TARGET= all
 install:=       TARGET= install
 clean:=         TARGET= clean
diff --git a/usr/src/cmd/ldapcachemgr/Makefile b/usr/src/cmd/ldapcachemgr/Makefile
index 5a5b08ea3d..b396397820 100644
--- a/usr/src/cmd/ldapcachemgr/Makefile
+++ b/usr/src/cmd/ldapcachemgr/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	ldap_cachemgr
 
@@ -55,6 +56,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 # Message files
 POFILE=		ldap_cachemgr.po
 POFILES=	${OBJS:%.o=%.po}
diff --git a/usr/src/cmd/listen/Makefile b/usr/src/cmd/listen/Makefile
index 902064e388..d37edf6d6c 100644
--- a/usr/src/cmd/listen/Makefile
+++ b/usr/src/cmd/listen/Makefile
@@ -23,6 +23,8 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+
 PROG= listen nlps_server
 
 DBGOBJ	= doprnt.o
@@ -63,6 +65,9 @@ CERRWARN += -_gcc=-Wno-empty-body
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 $(LIBSAFD)/% : %
 	$(INS.file)
 
diff --git a/usr/src/cmd/loadkeys/Makefile b/usr/src/cmd/loadkeys/Makefile
index 53f6ec8787..df0c686088 100644
--- a/usr/src/cmd/loadkeys/Makefile
+++ b/usr/src/cmd/loadkeys/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= loadkeys dumpkeys
 sparc_SUBDIRS= type_4 type_6 type_101
@@ -42,6 +43,9 @@ CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-unused-label
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 CLOBBERFILES = $(PROG) loadkeys.c
 
 .KEEP_STATE:
diff --git a/usr/src/cmd/lockstat/Makefile.com b/usr/src/cmd/lockstat/Makefile.com
index 54ec4d5853..7e8ee6cf6d 100644
--- a/usr/src/cmd/lockstat/Makefile.com
+++ b/usr/src/cmd/lockstat/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= lockstat
 OBJS= lockstat.o sym.o
@@ -33,6 +34,9 @@ LDLIBS += -lelf -lkstat -ldtrace
 CFLAGS += $(CCVERBOSE)
 CFLAGS64 += $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-uninitialized
+
+SMOFF += index_overflow
+
 LINTFLAGS += -xerroff=E_SEC_SPRINTF_UNBOUNDED_COPY
 LINTFLAGS64 += -xerroff=E_SEC_SPRINTF_UNBOUNDED_COPY
 
diff --git a/usr/src/cmd/lofiadm/Makefile b/usr/src/cmd/lofiadm/Makefile
index 07d01206a2..462488cd35 100644
--- a/usr/src/cmd/lofiadm/Makefile
+++ b/usr/src/cmd/lofiadm/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= lofiadm
 OBJS= main.o utils.o
@@ -30,7 +31,7 @@ LZMAOBJS= LzmaEnc.o LzFind.o
 
 SRCS= $(OBJS:%.o=%.c)
 
-POFILES= $(OBJS:%.o=%.po) 
+POFILES= $(OBJS:%.o=%.po)
 
 include ../Makefile.cmd
 
@@ -40,6 +41,9 @@ LDLIBS += -ldevinfo -lpkcs11 -lcryptoutil
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LINTFLAGS += -erroff=E_NAME_USED_NOT_DEF2
 
 .KEEP_STATE:
diff --git a/usr/src/cmd/look/Makefile b/usr/src/cmd/look/Makefile
index 6ba55dd43b..afe2a58dc7 100644
--- a/usr/src/cmd/look/Makefile
+++ b/usr/src/cmd/look/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= look
 DATADIR= dict
@@ -37,6 +38,9 @@ DIRS=		$(ROOTDATADIR)
 
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 FILEMODE=	755
 
 $(ROOTDATADIR)/$(DATA):= FILEMODE=444
diff --git a/usr/src/cmd/lp/Makefile.lp b/usr/src/cmd/lp/Makefile.lp
index 90814cf119..c4c4ff2a92 100644
--- a/usr/src/cmd/lp/Makefile.lp
+++ b/usr/src/cmd/lp/Makefile.lp
@@ -23,6 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 #
 # cmd/lp/Makefile.lp
@@ -97,6 +98,9 @@ CERRWARN +=	-_gcc=-Wno-empty-body
 CERRWARN +=	-_gcc=-Wno-extra
 CERRWARN +=	-_gcc=-Wno-address
 
+# not linted
+SMATCH=off
+
 all:=		TARGET= all
 install:=	TARGET= install
 clean:=		TARGET= clean
diff --git a/usr/src/cmd/lp/lib/filters/Makefile b/usr/src/cmd/lp/lib/filters/Makefile
index 4b91ddcc4b..09c55243b6 100644
--- a/usr/src/cmd/lp/lib/filters/Makefile
+++ b/usr/src/cmd/lp/lib/filters/Makefile
@@ -23,6 +23,7 @@
 # Copyright 1990-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY	=	liblpflt.a
 
@@ -52,6 +53,9 @@ CPPFLAGS =	-I../../include $(CPPFLAGS.master)
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 POFILE =	lp_lib_filters.po
 
 .KEEP_STATE:
diff --git a/usr/src/cmd/lp/lib/oam/Makefile b/usr/src/cmd/lp/lib/oam/Makefile
index 531a504f7f..871fdb45f2 100644
--- a/usr/src/cmd/lp/lib/oam/Makefile
+++ b/usr/src/cmd/lp/lib/oam/Makefile
@@ -23,10 +23,8 @@
 # Copyright 1990-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/lp/lib/oam/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
+
 include         ../../Makefile.lp
 
 LIBRARY =		liblpoam.a
@@ -71,6 +69,9 @@ LIBS = $(LIBRARY)
 
 CPPFLAGS =		-I$(LPINC) $(CPPFLAGS.master)
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all install :		$(TXTFILES) $(LIBS)
diff --git a/usr/src/cmd/luxadm/Makefile b/usr/src/cmd/luxadm/Makefile
index 75bb1db5f7..7b8abc40d3 100644
--- a/usr/src/cmd/luxadm/Makefile
+++ b/usr/src/cmd/luxadm/Makefile
@@ -22,11 +22,12 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG = luxadm
 
 COBJS = adm.o fchba.o lux_util.o fabric_conf.o
-OBJS_sparc= g_adm.o diag.o fcalupdate.o hotplug.o qlgcupdate.o setboot.o 
+OBJS_sparc= g_adm.o diag.o fcalupdate.o hotplug.o qlgcupdate.o setboot.o
 OBJS_i386 = x86_adm.o errormsgs.o
 OBJS = $(OBJS_$(MACH)) $(COBJS)
 
@@ -42,6 +43,9 @@ CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-address
 
+# not linted
+SMATCH=off
+
 sparc_LDLIBS = -la5k -lg_fc -ldevid -lkstat -ldevinfo
 i386_LDLIBS =
 LDLIBS += $($(MACH)_LDLIBS)
diff --git a/usr/src/cmd/mail/Makefile b/usr/src/cmd/mail/Makefile
index 0bd18f5023..8f24d04f95 100644
--- a/usr/src/cmd/mail/Makefile
+++ b/usr/src/cmd/mail/Makefile
@@ -22,9 +22,10 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+#
 
-
-BINPROG=	mail 
+BINPROG=	mail
 
 PROG= 	       $(BINPROG)
 
@@ -76,6 +77,9 @@ CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-clobbered
 CERRWARN +=	-_gcc=-Wno-extra
 
+# missing type declarations for old-style functions
+SMATCH =	off
+
 LDLIBS +=	-lmail -lsocket
 
 # mail defines its own delete() - reduce symbols to locals to remove name clash.
@@ -104,7 +108,7 @@ $(ROOTINC)/% : %
 
 .PARALLEL: $(MAILOBJS) $(OBJS)
 
-all:		$(PROG) 
+all:		$(PROG)
 
 mail: 		$(MAILOBJS)
 	$(LINK.c) -o $@ $(MAILOBJS) $(LDLIBS)
@@ -117,7 +121,7 @@ install: all .WAIT $(ROOTBINPROG) $(ROOTSYMLINKS)
 $(ROOTBIN)/rmail:
 	$(RM) $@; $(SYMLINK) mail $@
 
-lint: 
+lint:
 	$(LINT.c) $(MAILSRC)
 
 clean:
diff --git a/usr/src/cmd/mailwrapper/Makefile b/usr/src/cmd/mailwrapper/Makefile
index 0e66a47b93..45d8d780b1 100644
--- a/usr/src/cmd/mailwrapper/Makefile
+++ b/usr/src/cmd/mailwrapper/Makefile
@@ -12,10 +12,11 @@
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Copyright 2014 Alexander Pyhalov
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 
-LIBPROG=	mailwrapper 
+LIBPROG=	mailwrapper
 
 PROG= 	       $(LIBPROG)
 
@@ -49,6 +50,8 @@ CPPFLAGS =	-I. $(CPPFLAGS.master)
 
 LINTFLAGS	+= -erroff=E_FUNC_RET_ALWAYS_IGNOR2
 
+SMOFF += all_func_returns
+
 # conditional assignments
 #
 all:=		TARGET= all
@@ -65,7 +68,7 @@ $(ROOTINC)/% : %
 
 .PARALLEL: $(MWOBJS) $(OBJS)
 
-all:		$(PROG) 
+all:		$(PROG)
 
 mailwrapper:	$(MWOBJS)
 	$(LINK.c) -o $@ $(MWOBJS) $(LDLIBS)
@@ -75,7 +78,7 @@ install: all .WAIT $(ROOTLIBPROG) $(ROOTSYMLINKS) $(ROOTETCFILES)
 
 # ROOTSYMLINKS
 #
-$(ROOTBIN)/mailq: 
+$(ROOTBIN)/mailq:
 	$(RM) $@; $(SYMLINK) ../lib/mailwrapper $@
 
 $(ROOTLIB)/sendmail:
@@ -90,7 +93,7 @@ $(ROOTUSRSBIN)/sendmail:
 $(ROOTETCMAIL)/%:  %
 	$(INS.file)
 
-lint: 
+lint:
 	$(LINT.c) $(SRCS)
 
 clean:
diff --git a/usr/src/cmd/mailx/Makefile b/usr/src/cmd/mailx/Makefile
index 6afe955bf2..939ed76141 100644
--- a/usr/src/cmd/mailx/Makefile
+++ b/usr/src/cmd/mailx/Makefile
@@ -68,6 +68,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-clobbered
+# not linted
+SMATCH=off
+
 LINTFLAGS=	-hb
 LDLIBS +=	-lmail -lcustr
 LDFLAGS +=	$(MAPFILE.NGB:%=-M%)
diff --git a/usr/src/cmd/mandoc/Makefile.common b/usr/src/cmd/mandoc/Makefile.common
index 0c00bf6fd5..f8834bb4a8 100644
--- a/usr/src/cmd/mandoc/Makefile.common
+++ b/usr/src/cmd/mandoc/Makefile.common
@@ -79,6 +79,9 @@ OBJS +=		compat_ohash.o
 # XXX gcc 4.4.4 false positive
 roff.o :=	CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 CFLAGS +=	$(CC_VERBOSE)
 CSTD=		$(CSTD_GNU99)
 
diff --git a/usr/src/cmd/mdb/Makefile.mdb b/usr/src/cmd/mdb/Makefile.mdb
index 529f3a9a12..c235559ee5 100644
--- a/usr/src/cmd/mdb/Makefile.mdb
+++ b/usr/src/cmd/mdb/Makefile.mdb
@@ -109,6 +109,8 @@ CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-unused-label
 CERRWARN += -_gcc=-Wno-unused-variable
 
+SMOFF += all_func_returns
+
 #
 # -erroff=E_INCONS_ARG_DECL2 works around a problem where lint gets confused
 # about how struct mdb_tgt_gregset is used in mdb_tgt_stack_f() and
diff --git a/usr/src/cmd/mdb/Makefile.module b/usr/src/cmd/mdb/Makefile.module
index b93681d85e..5bfdbf8434 100644
--- a/usr/src/cmd/mdb/Makefile.module
+++ b/usr/src/cmd/mdb/Makefile.module
@@ -23,7 +23,7 @@
 # Use is subject to license terms.
 #
 # Copyright (c) 2013 by Delphix. All rights reserved.
-# Copyright 2015, Joyent, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 .KEEP_STATE:
@@ -129,6 +129,8 @@ LDFLAGS64		+= $(ZTEXT)
 ASFLAGS			+= -P
 AS_CPPFLAGS		+= -D_ASM
 
+SMOFF += all_func_returns,index_overflow
+
 # Module type-specific compiler flags
 $(MODOBJS) :=			CFLAGS += $(C_BIGPICFLAGS) $(XREGSFLAG)
 $(MODOBJS) :=			CFLAGS64 += $(C_BIGPICFLAGS) $(XREGSFLAG)
diff --git a/usr/src/cmd/mdb/intel/amd64/ip/Makefile b/usr/src/cmd/mdb/intel/amd64/ip/Makefile
index 5112aeaac0..f7ebb0c677 100644
--- a/usr/src/cmd/mdb/intel/amd64/ip/Makefile
+++ b/usr/src/cmd/mdb/intel/amd64/ip/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 MODULE = ip.so
 MDBTGT = kvm
@@ -34,3 +35,6 @@ include ../../Makefile.amd64
 include ../../../Makefile.module
 
 CPPFLAGS += -I$(SRC)/uts/common/inet
+
+# needs work
+SMOFF += shift_to_zero
diff --git a/usr/src/cmd/mdb/intel/ia32/libpython/Makefile b/usr/src/cmd/mdb/intel/ia32/libpython/Makefile
index 4ad419c859..9e19bf2e41 100644
--- a/usr/src/cmd/mdb/intel/ia32/libpython/Makefile
+++ b/usr/src/cmd/mdb/intel/ia32/libpython/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include $(SRC)/Makefile.master
 
@@ -39,8 +40,17 @@ include ../../../Makefile.module
 
 %.o := CPPFLAGS += $(PYCPPFLAGS)
 %.ln := CPPFLAGS += $(PYLNFLAGS)
+
+#
+# Why these? Well, the pyconfig.h header hard-codes _FILE_OFFSET_BITS
+# to 64, regardless of what we have set here.  GCC quietens this complaint via
+# use of -isystem, but neither lint nor smatch can do that.
+#
 LINTFLAGS += -erroff=E_MACRO_REDEFINED
 
+# not linted
+SMATCH=off
+
 dmod/$(MODULE) := LDLIBS += -lproc
 
 %.o: $(MODSRCS_DIR)/%.c
diff --git a/usr/src/cmd/mkmsgs/Makefile b/usr/src/cmd/mkmsgs/Makefile
index d2ebe036bf..3bf86c9da2 100644
--- a/usr/src/cmd/mkmsgs/Makefile
+++ b/usr/src/cmd/mkmsgs/Makefile
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= mkmsgs
 
@@ -30,9 +31,12 @@ LDLIBS += -lgen
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTPROG)
 
diff --git a/usr/src/cmd/modload/Makefile.com b/usr/src/cmd/modload/Makefile.com
index 3033e5942a..cf82649c7d 100644
--- a/usr/src/cmd/modload/Makefile.com
+++ b/usr/src/cmd/modload/Makefile.com
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/modload/Makefile.com
+# Copyright (c) 2018, Joyent, Inc.
 #
 # makefile for loadable module utilities
 
@@ -61,6 +61,9 @@ LINTFLAGS += -erroff=E_NAME_DEF_NOT_USED2
 
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 # install specifics
 
 $(ROOTDRVPROG) := FILEMODE = 0555
diff --git a/usr/src/cmd/more/Makefile b/usr/src/cmd/more/Makefile
index 9ad39bb247..cfa30880a2 100644
--- a/usr/src/cmd/more/Makefile
+++ b/usr/src/cmd/more/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= more
 DATA= more.help
@@ -41,9 +42,12 @@ CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-clobbered
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
-all: $(PROG) $(DATA) 
+all: $(PROG) $(DATA)
 
 install: all $(ROOTPROG) $(ROOTLIBDATA)
 	$(RM) $(ROOTBIN)/page
diff --git a/usr/src/cmd/mpathadm/Makefile b/usr/src/cmd/mpathadm/Makefile
index 1fff65a611..1c22115e65 100644
--- a/usr/src/cmd/mpathadm/Makefile
+++ b/usr/src/cmd/mpathadm/Makefile
@@ -22,7 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/mpathadm/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 include ../Makefile.cmd
 
@@ -37,9 +37,12 @@ LDLIBS += -lMPAPI -ldevid
 
 LINTFLAGS += -xerroff=E_BAD_FORMAT_STR2
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 $(PROG): $(OBJS)
 	$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
diff --git a/usr/src/cmd/ndmpd/Makefile b/usr/src/cmd/ndmpd/Makefile
index 4d5ed69075..d1dd86cf8d 100644
--- a/usr/src/cmd/ndmpd/Makefile
+++ b/usr/src/cmd/ndmpd/Makefile
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 #
@@ -51,6 +52,9 @@ CPPFLAGS += $(LFLAGS64)
 CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DDEBUG
 CPPFLAGS += -I. -Iinclude
 
+# not linted
+SMATCH=off
+
 CSTD = $(CSTD_GNU99)
 
 # lint does not like unused _umem_*_init
diff --git a/usr/src/cmd/ndmpstat/Makefile b/usr/src/cmd/ndmpstat/Makefile
index 94458f9f9b..f9bf0d8427 100644
--- a/usr/src/cmd/ndmpstat/Makefile
+++ b/usr/src/cmd/ndmpstat/Makefile
@@ -2,6 +2,8 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+#
 
 #
 # BSD 3 Clause License
@@ -47,6 +49,8 @@ POFILE=		ndmpstat.po
 
 LDLIBS += -lndmp
 
+SMOFF += signed
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/news/Makefile b/usr/src/cmd/news/Makefile
index 214ae487bd..0d7fcbd64f 100644
--- a/usr/src/cmd/news/Makefile
+++ b/usr/src/cmd/news/Makefile
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= news 
 
@@ -32,6 +33,9 @@ DIRS= $(VARNEWSD)
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG) 
diff --git a/usr/src/cmd/nl/Makefile b/usr/src/cmd/nl/Makefile
index 1d68f2308f..20caaeb35f 100644
--- a/usr/src/cmd/nl/Makefile
+++ b/usr/src/cmd/nl/Makefile
@@ -22,6 +22,8 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+#
 # Message catalog requires no special processing because messages
 # only occur in ./nl.c, not in ../expr/compile.c.
 
@@ -40,6 +42,10 @@ LDLIBS += -lgen
 CFLAGS += $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-unused-variable
+
+# not linted
+SMATCH=off
+
 $(XPG4):= CPPFLAGS += -DXPG4
 
 MAPFILE.INT =	../expr/mapfile-intf
diff --git a/usr/src/cmd/nlsadmin/Makefile b/usr/src/cmd/nlsadmin/Makefile
index ce2bc57745..9f88bb3986 100644
--- a/usr/src/cmd/nlsadmin/Makefile
+++ b/usr/src/cmd/nlsadmin/Makefile
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= nlsadmin
 
@@ -31,6 +32,9 @@ CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG) 
diff --git a/usr/src/cmd/nscd/Makefile b/usr/src/cmd/nscd/Makefile
index f24ae5d394..08eb99fb30 100644
--- a/usr/src/cmd/nscd/Makefile
+++ b/usr/src/cmd/nscd/Makefile
@@ -20,6 +20,7 @@
 #
 #
 # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 # Makefile for name service cache daemon
 #
@@ -64,6 +65,9 @@ CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-type-limits
 
+# not linted
+SMATCH=off
+
 # nscd interposes on many symbols, and must export others for its own dlsym()
 # use, and dlsym() calls from libc.  Itemizing the interfaces within a mapfile
 # is error-prone, so establish the whole object as an interposer.
diff --git a/usr/src/cmd/nvmeadm/Makefile b/usr/src/cmd/nvmeadm/Makefile
index a0cc24ead0..3935f784a8 100644
--- a/usr/src/cmd/nvmeadm/Makefile
+++ b/usr/src/cmd/nvmeadm/Makefile
@@ -29,6 +29,9 @@ CFLAGS +=	$(CCVERBOSE)
 LDLIBS +=	-ldevinfo
 CSTD=	$(CSTD_GNU99)
 
+# error: cannot size expression
+SMATCH=off
+
 all: $(PROG)
 
 $(PROG): $(OBJS)
diff --git a/usr/src/cmd/oamuser/group/Makefile b/usr/src/cmd/oamuser/group/Makefile
index 8289dbda77..7c87c203df 100644
--- a/usr/src/cmd/oamuser/group/Makefile
+++ b/usr/src/cmd/oamuser/group/Makefile
@@ -23,8 +23,7 @@
 #
 # Copyright (c) 2013 RackTop Systems.
 #
-# cmd/oamuser/group/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 include ../../Makefile.cmd
 
@@ -54,6 +53,9 @@ INSSBINPROG=	$(SBINPROG:%=$(ROOTUSRSBIN)/%)
 CPPFLAGS=	-I$(HERE) -I$(LOCAL) $(CPPFLAGS.master)
 FILEMODE= 	0555
 
+# not linted
+SMATCH=off
+
 $(GROUPADD) :=	OBJS = $(ADD_OBJ)
 $(GROUPADD) :=	LDLIBS += $(LIBUSRGRP) -lcmdutils
 
diff --git a/usr/src/cmd/oamuser/lib/Makefile b/usr/src/cmd/oamuser/lib/Makefile
index 36f85ac89f..b5e506554d 100644
--- a/usr/src/cmd/oamuser/lib/Makefile
+++ b/usr/src/cmd/oamuser/lib/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= 	lib.a
 
@@ -66,6 +67,9 @@ CPPFLAGS=	-I. -I$(GENERAL) $(CPPFLAGS.master)
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-type-limits
 CERRWARN +=	-_gcc=-Wno-unused-variable
+# not linted
+SMATCH=off
+
 ARFLAGS=	cr
 AROBJS=		`$(LORDER) $(OBJS) | $(TSORT)`
 LINTFLAGS=	-u
diff --git a/usr/src/cmd/oamuser/user/Makefile b/usr/src/cmd/oamuser/user/Makefile
index a8feed2b6d..aa4f3e1365 100644
--- a/usr/src/cmd/oamuser/user/Makefile
+++ b/usr/src/cmd/oamuser/user/Makefile
@@ -23,8 +23,7 @@
 # Copyright (c) 2013 RackTop Systems.
 # Copyright (c) 2013 Gary Mills
 #
-# cmd/oamuser/user/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 DEFAULTFILES= useradd.dfl
 
@@ -76,6 +75,9 @@ INSSKELFILE=	$(SKELFILE:%=$(ROOTSKEL)/%)
 CPPFLAGS=	-I$(HERE) -I$(LOCAL) $(CPPFLAGS.master)
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 $(INSSBINPROG)  := FILEMODE = 0555
 $(INSSYSADMPROG):= FILEMODE = 0500
 $(INSSKELFILE)  := FILEMODE = 0644
diff --git a/usr/src/cmd/oawk/Makefile b/usr/src/cmd/oawk/Makefile
index 1b148cf0de..0ca6be8064 100644
--- a/usr/src/cmd/oawk/Makefile
+++ b/usr/src/cmd/oawk/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include		../Makefile.cmd
 
@@ -69,6 +70,9 @@ CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-extra
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# missing type declarations
+SMATCH =	off
+
 .KEEP_STATE :
 
 all :		$(PROG) $(TXTS)
diff --git a/usr/src/cmd/passmgmt/Makefile b/usr/src/cmd/passmgmt/Makefile
index f6d9bf3283..2ce3ab254f 100644
--- a/usr/src/cmd/passmgmt/Makefile
+++ b/usr/src/cmd/passmgmt/Makefile
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 
 PROG= 		passmgmt
@@ -42,6 +43,9 @@ CERRWARN +=	-_gcc=-Wno-type-limits
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 all: $(PROG) $(TXTS)
 
 XGETFLAGS= -a -x $(PROG).xcl 
diff --git a/usr/src/cmd/perl/Makefile.targ b/usr/src/cmd/perl/Makefile.targ
index b3f5ec9bd3..ec6110c5cb 100644
--- a/usr/src/cmd/perl/Makefile.targ
+++ b/usr/src/cmd/perl/Makefile.targ
@@ -11,7 +11,7 @@
 #
 # Copyright (c) 2014 Racktop Systems.
 # Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved.
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 # Link against libc as perl solaris specs
 $(PERLEXT):= LDLIBS += -lc
@@ -26,6 +26,8 @@ $(ROOTPERLMOD) := FILEMODE = 0444
 PCFLAGS= -DPERL_EUPXS_ALWAYS_EXPORT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
 	-DPERL_USE_SAFE_PUTENV -D_TS_ERRNO
 
+SMATCH=off
+
 $(MACH):
 	$(INS.dir)
 
diff --git a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com
index a797ca6ea4..b590aa9806 100644
--- a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com
+++ b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libpicld_pluginutil.a
 VERS=		.1
@@ -53,6 +54,9 @@ POFILE=	picld_pluginutil.po
 CPPFLAGS +=	-I.. -I$(SRC)/lib/libpicl -I$(SRC)/lib/libpicltree
 CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-uninitialized
+
+SMOFF += all_func_returns
+
 CPPFLAGS +=	-D_REENTRANT
 DYNFLAGS +=	$(ZNOLAZYLOAD)
 LDLIBS +=	-L$(SRC)/lib/libpicltree/$(MACH)
diff --git a/usr/src/cmd/pools/poolcfg/Makefile b/usr/src/cmd/pools/poolcfg/Makefile
index 670674e968..5b117fcf04 100644
--- a/usr/src/cmd/pools/poolcfg/Makefile
+++ b/usr/src/cmd/pools/poolcfg/Makefile
@@ -22,9 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/pools/poolbind/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		poolcfg
 OBJS =		poolcfg_lex.o poolcfg_grammar.o
@@ -49,6 +47,9 @@ LDLIBS +=	-lpool -ll
 XGETFLAGS =	-a
 CLOBBERFILES +=	poolcfg_lex.c poolcfg_grammar.c poolcfg_grammar.h
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/pools/poold/Makefile b/usr/src/cmd/pools/poold/Makefile
index cc1e3791f1..757f882219 100644
--- a/usr/src/cmd/pools/poold/Makefile
+++ b/usr/src/cmd/pools/poold/Makefile
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/pools/poold/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		poold
 OBJS =		poold.o
@@ -87,6 +87,9 @@ LINTFLAGS +=	-erroff=E_NAME_USED_NOT_DEF2
 $(BLD_JAVA_8)LINTFLAGS64 += -erroff=E_NAME_USED_NOT_DEF2
 LINTLIBS +=	-L$(LIBPOOL_PATH) -lpool
 
+# not linted
+SMATCH=off
+
 CPPFLAGS +=	$(INCS)
 ROOTCMDDIR =	$(ROOT)/usr/lib/pool
 
diff --git a/usr/src/cmd/pools/poold/libjkstat/Makefile.com b/usr/src/cmd/pools/poold/libjkstat/Makefile.com
index 21f1762460..54cba6a88e 100644
--- a/usr/src/cmd/pools/poold/libjkstat/Makefile.com
+++ b/usr/src/cmd/pools/poold/libjkstat/Makefile.com
@@ -22,8 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libjkstat.a
 VERS =		.1
@@ -42,6 +41,9 @@ ROOTLIBDIR =	$(ROOT)/usr/lib/pool
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT -D_FILE_OFFSET_BITS=64 $(INCS)
 
+# not linted
+SMATCH=off
+
 all: $(LIBS)
 
 lint: lintcheck
diff --git a/usr/src/cmd/pools/poold/libjlgrp/Makefile.com b/usr/src/cmd/pools/poold/libjlgrp/Makefile.com
index f878b1e6f2..9011c5a3e0 100644
--- a/usr/src/cmd/pools/poold/libjlgrp/Makefile.com
+++ b/usr/src/cmd/pools/poold/libjlgrp/Makefile.com
@@ -22,8 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libjlgrp.a
 VERS =		.1
@@ -42,6 +41,9 @@ ROOTLIBDIR =	$(ROOT)/usr/lib/pool
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT -D_FILE_OFFSET_BITS=64 $(INCS)
 
+# not linted
+SMATCH=off
+
 all: $(LIBS)
 
 lint: lintcheck
diff --git a/usr/src/cmd/pools/poold/libjpool/Makefile.com b/usr/src/cmd/pools/poold/libjpool/Makefile.com
index 58567468ab..68d513026e 100644
--- a/usr/src/cmd/pools/poold/libjpool/Makefile.com
+++ b/usr/src/cmd/pools/poold/libjpool/Makefile.com
@@ -22,8 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libjpool.a
 VERS =		.1
@@ -42,6 +41,9 @@ ROOTLIBDIR =	$(ROOT)/usr/lib/pool
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT -D_FILE_OFFSET_BITS=64 $(INCS)
 
+# not linted
+SMATCH=off
+
 all: $(LIBS)
 
 lint: lintcheck
diff --git a/usr/src/cmd/pools/poold/libjsyslog/Makefile.com b/usr/src/cmd/pools/poold/libjsyslog/Makefile.com
index 9b0fc312a8..8f57d254e2 100644
--- a/usr/src/cmd/pools/poold/libjsyslog/Makefile.com
+++ b/usr/src/cmd/pools/poold/libjsyslog/Makefile.com
@@ -22,8 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libjsyslog.a
 VERS =		.1
@@ -42,6 +41,9 @@ ROOTLIBDIR =	$(ROOT)/usr/lib/pool
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT -D_FILE_OFFSET_BITS=64 $(INCS)
 
+# not linted
+SMATCH=off
+
 all: $(LIBS)
 
 lint: lintcheck
diff --git a/usr/src/cmd/power/Makefile b/usr/src/cmd/power/Makefile
index 3934605588..77c3699bb9 100644
--- a/usr/src/cmd/power/Makefile
+++ b/usr/src/cmd/power/Makefile
@@ -22,8 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/power/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 DAEMON_SRCS =	powerd.c sysstat.c
 DAEMON_OBJS =	$(DAEMON_SRCS:%.c=%.o)
@@ -75,14 +74,16 @@ ROOTLIBPOWERDAEMON= $(DAEMON:%=$(ROOTLIBPOWER)/%)
 $(ROOTLIBPOWER) := FILEMODE= 755
 $(ROOTLIBPOWERDAEMON) := FILEMODE= 555
 
-ROOTETCFILES= $(ETCFILES:%=$(ROOTETC)/%) 
-$(ROOTETCFILES) := FILEMODE= 644 
+ROOTETCFILES= $(ETCFILES:%=$(ROOTETC)/%)
+$(ROOTETCFILES) := FILEMODE= 644
 
 #
 # lint pass one enforcement
 #
 CFLAGS += $(CCVERBOSE)
 
+SMOFF += signed
+
 .PARALLEL: $(OBJS)
 
 .KEEP_STATE:
diff --git a/usr/src/cmd/powertop/Makefile.com b/usr/src/cmd/powertop/Makefile.com
index 441cefcbbc..37a1434c04 100644
--- a/usr/src/cmd/powertop/Makefile.com
+++ b/usr/src/cmd/powertop/Makefile.com
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG = powertop
 
@@ -43,6 +44,9 @@ CFLAGS		+= $(CCVERBOSE)
 CFLAGS64	+= $(CCVERBOSE)
 CERRWARN	+= -_gcc=-Wno-parentheses
 CERRWARN	+= -_gcc=-Wno-uninitialized
+
+SMOFF += free
+
 LDLIBS		+= -lcurses -ldtrace -lkstat
 
 FILEMODE	= 0555
diff --git a/usr/src/cmd/pr/Makefile b/usr/src/cmd/pr/Makefile
index 802d3170c6..6480487087 100644
--- a/usr/src/cmd/pr/Makefile
+++ b/usr/src/cmd/pr/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= pr
 XPG4PROG= pr
@@ -33,6 +34,8 @@ DCFILE = $(PROG).dc
 
 CERRWARN += -_gcc=-Wno-parentheses
 
+SMOFF += indenting
+
 $(XPG4):= CPPFLAGS += -DXPG4
 $(POFILE) := XGETFLAGS += -a -x pr.xcl
 
diff --git a/usr/src/cmd/praudit/Makefile b/usr/src/cmd/praudit/Makefile
index 4a1b957841..b364320c8e 100644
--- a/usr/src/cmd/praudit/Makefile
+++ b/usr/src/cmd/praudit/Makefile
@@ -24,7 +24,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 XLATEDIR = $(SRC)/lib/libbsm/common
 
@@ -45,6 +45,8 @@ CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+SMOFF += signed
+
 LDLIBS += -lbsm -lnsl -lpam -ltsol
 
 .KEEP_STATE:
diff --git a/usr/src/cmd/prctl/Makefile.com b/usr/src/cmd/prctl/Makefile.com
index 7c57f8f7ac..6327f99b25 100644
--- a/usr/src/cmd/prctl/Makefile.com
+++ b/usr/src/cmd/prctl/Makefile.com
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	prctl
 
@@ -36,6 +37,9 @@ CFLAGS	+= $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LDLIBS	+= -lproc -lproject
 
 # Adding this flag to LINTFLAGS did not do anything.  I'm adding this flag
diff --git a/usr/src/cmd/print/bsd-sysv-commands/Makefile b/usr/src/cmd/print/bsd-sysv-commands/Makefile
index ee6131c805..cb71a89a43 100644
--- a/usr/src/cmd/print/bsd-sysv-commands/Makefile
+++ b/usr/src/cmd/print/bsd-sysv-commands/Makefile
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 include		../Makefile.sp
 
@@ -67,6 +67,9 @@ in.lpd:=	LDLIBS +=	-lnsl -lsocket
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 all:	$(BINPROGS) $(SBINPROGS)
 
 #	each program needs common.o as well
diff --git a/usr/src/cmd/print/conv_fix/Makefile b/usr/src/cmd/print/conv_fix/Makefile
index cac80619e0..73b53b46af 100644
--- a/usr/src/cmd/print/conv_fix/Makefile
+++ b/usr/src/cmd/print/conv_fix/Makefile
@@ -22,8 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/lp/client/conv_fix/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 include 	../Makefile.sp
 
@@ -41,11 +40,14 @@ CPPFLAGS +=	-I$(NPRTINC)
 
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all:		$(PROG)
 
-install:	all $(ROOTLIBPRINTPROG) 
+install:	all $(ROOTLIBPRINTPROG)
 
 $(ROOTLIBPRINT)/%: %
 	$(INS.file)
diff --git a/usr/src/cmd/print/lpset/Makefile b/usr/src/cmd/print/lpset/Makefile
index 7b81c117b2..1929022f9f 100644
--- a/usr/src/cmd/print/lpset/Makefile
+++ b/usr/src/cmd/print/lpset/Makefile
@@ -22,8 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/lp/client/lpset/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 include 	../Makefile.sp
 
@@ -39,13 +38,17 @@ FILEMODE=	04511
 
 CPPFLAGS +=	-I$(NPRTINC)
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
+
+# not linted
+SMATCH=off
+
 LDLIBS +=	$(LIBNPRT) -lsecdb
 
 .KEEP_STATE:
 
 all:		$(PROG)
 
-install:	all $(ROOTBIN) $(ROOTBINPROG) 
+install:	all $(ROOTBIN) $(ROOTBINPROG)
 
 $(ROOTBIN):
 	$(INS.dir)
diff --git a/usr/src/cmd/print/printer-info/Makefile b/usr/src/cmd/print/printer-info/Makefile
index 1aed6ba8f5..cbeb335826 100644
--- a/usr/src/cmd/print/printer-info/Makefile
+++ b/usr/src/cmd/print/printer-info/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include		../Makefile.sp
 
@@ -34,8 +35,6 @@ OBJECTS =	$(PROG).o
 ROOTPROG=	$(PROG:%=$(ROOTLIBLPBIN)/%)
 $(ROOTPROG)	:= FILEMODE=555
 
-CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
-
 .KEEP_STATE:
 
 all:		$(PROG)
@@ -46,13 +45,13 @@ $(ROOTLIBLPBIN):
 $(ROOTLIBLPBIN)/%:	%
 	$(INS.file)
 
-install:	all $(ROOTLIBLPBIN) $(ROOTPROG) 
+install:	all $(ROOTLIBLPBIN) $(ROOTPROG)
 
 $(PROGRAM):	$(OBJECTS)
 	$(CC) $(CFLAGS) -o $@ $(OBJECTS)
 
 clean:
-	$(RM) $(PROG) *.o 
+	$(RM) $(PROG) *.o
 
 cstyle:
 	cstyle $(SRCS)
diff --git a/usr/src/cmd/print/printer-info/printer-info.c b/usr/src/cmd/print/printer-info/printer-info.c
index a469c5194d..dddf0d3a68 100644
--- a/usr/src/cmd/print/printer-info/printer-info.c
+++ b/usr/src/cmd/print/printer-info/printer-info.c
@@ -24,9 +24,12 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/ioctl.h>
diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile
index 690b18ccfa..187517ea11 100644
--- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile
+++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 #
 # Makefile for Java Print Manager server
@@ -86,6 +87,9 @@ CPPFLAGS +=	-I$(JAVA_ROOT)/include -I$(JAVA_ROOT)/include/solaris -I.
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lprint -lnsl -lsocket -lc
 
 CLEANFILES=	*.class $(LINTLIB) $(LINTOUT)
diff --git a/usr/src/cmd/prtvtoc/Makefile b/usr/src/cmd/prtvtoc/Makefile
index 59db9914bd..c4ae5fe936 100644
--- a/usr/src/cmd/prtvtoc/Makefile
+++ b/usr/src/cmd/prtvtoc/Makefile
@@ -21,10 +21,9 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/prtvtoc/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
-PROG= prtvtoc 
+PROG= prtvtoc
 
 include ../Makefile.cmd
 
@@ -35,9 +34,12 @@ LDLIBS +=	-ladm -lefi
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTUSRSBINPROG) $(ROOTSYMLINK)
 
diff --git a/usr/src/cmd/ps/Makefile.com b/usr/src/cmd/ps/Makefile.com
index aa7a2bec45..d9209ba95a 100644
--- a/usr/src/cmd/ps/Makefile.com
+++ b/usr/src/cmd/ps/Makefile.com
@@ -22,8 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/ps/Makefile.com
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	ps
 
@@ -36,6 +35,9 @@ include ../../Makefile.cmd
 CFLAGS	+= $(CCVERBOSE)
 LDLIBS += -lproject
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 %.o:	../%.c
diff --git a/usr/src/cmd/ptools/Makefile.bld b/usr/src/cmd/ptools/Makefile.bld
index da679b3f20..d18df19483 100644
--- a/usr/src/cmd/ptools/Makefile.bld
+++ b/usr/src/cmd/ptools/Makefile.bld
@@ -24,6 +24,7 @@
 # Use is subject to license terms.
 # Copyright 2015 Joyent, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG:sh = basename `cd ..; pwd`
 
@@ -59,11 +60,15 @@ LDLIBS_pwdx		= -lproc
 LDLIBS += $(LDLIBS_$(PROG))
 
 CERRWARN_plgrp	+= -_gcc=-Wno-parentheses
+CERRWARN_plgrp	+= -_smatch=off
+
+CERRWARN_pmadvise += -_smatch=off
 
 CERRWARN_ppriv	+= -_gcc=-Wno-parentheses
 CERRWARN_ppriv	+= -_gcc=-Wno-uninitialized
 
 CERRWARN_ptree	+= -_gcc=-Wno-parentheses
+CERRWARN_ptree	+= -_smatch=off
 
 CERRWARN_pstack	+= -_gcc=-Wno-uninitialized
 CERRWARN_pstack	+= -_gcc=-Wno-clobbered
@@ -71,6 +76,8 @@ CERRWARN_pstack	+= -_gcc=-Wno-clobbered
 CERRWARN_pargs	+= -_gcc=-Wno-clobbered
 CERRWARN_pargs	+= -_gcc=-Wno-type-limits
 
+CERRWARN_pwait	+= -_smatch=off
+
 CERRWARN += $(CERRWARN_$(PROG))
 
 #
diff --git a/usr/src/cmd/pwconv/Makefile b/usr/src/cmd/pwconv/Makefile
index 90b1dfebea..9ef694bf6e 100644
--- a/usr/src/cmd/pwconv/Makefile
+++ b/usr/src/cmd/pwconv/Makefile
@@ -21,8 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/pwconv/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=           pwconv
 
@@ -32,9 +31,11 @@ TEXT_DOMAIN= SUNW_OST_ADMIN
 FILEMODE=       0555
 RELSBIN=        ../sbin
 
+SMOFF += indenting
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTUSRSBINPROG) $(ROOTPROG)
 
@@ -44,5 +45,5 @@ $(ROOTPROG):
 clean:
 
 lint:   lint_PROG
- 
+
 include ../Makefile.targ
diff --git a/usr/src/cmd/rcap/Makefile.com b/usr/src/cmd/rcap/Makefile.com
index fa5925f732..1289c6d4d8 100644
--- a/usr/src/cmd/rcap/Makefile.com
+++ b/usr/src/cmd/rcap/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 #
 # Definitions for targets shared by some subdirs, which have
@@ -35,6 +36,8 @@ CERRWARN += -_gcc=-Wno-unused-function
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-parentheses
 
+SMOFF += strcpy_overflow
+
 %.o: $(COMMON_DIR)/%.c
 	$(COMPILE.c) $<
 %.po: $(COMMON_DIR)/%.c
diff --git a/usr/src/cmd/rcm_daemon/Makefile.com b/usr/src/cmd/rcm_daemon/Makefile.com
index b060ee92a1..621e1cbfb9 100644
--- a/usr/src/cmd/rcm_daemon/Makefile.com
+++ b/usr/src/cmd/rcm_daemon/Makefile.com
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2016 Nexenta Systems, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 include ../../Makefile.cmd
@@ -124,6 +125,9 @@ CERRWARN += -_gcc=-Wno-unused-label
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 MAPFILES = ../common/mapfile-intf $(MAPFILE.NGB)
 rcm_daemon := LDFLAGS += $(MAPFILES:%=-M%)
 
diff --git a/usr/src/cmd/refer/Makefile b/usr/src/cmd/refer/Makefile
index 3c2ed48157..a07a51f0ac 100644
--- a/usr/src/cmd/refer/Makefile
+++ b/usr/src/cmd/refer/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include		../Makefile.cmd
 
@@ -50,6 +51,9 @@ CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 CLOBBERFILES += $(PROG3)
 
 addbib.po :=	XGETFLAGS += -a -x addbib.xcl
diff --git a/usr/src/cmd/regcmp/Makefile b/usr/src/cmd/regcmp/Makefile
index 969a8b6d4b..d77005366f 100644
--- a/usr/src/cmd/regcmp/Makefile
+++ b/usr/src/cmd/regcmp/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= regcmp 
 
@@ -29,6 +30,8 @@ include		../Makefile.cmd
 
 CERRWARN += -_gcc=-Wno-parentheses
 
+SMOFF += all_func_returns
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/rmformat/Makefile b/usr/src/cmd/rmformat/Makefile
index 91634d31fa..6761060197 100644
--- a/usr/src/cmd/rmformat/Makefile
+++ b/usr/src/cmd/rmformat/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= rmformat
 
@@ -36,6 +37,9 @@ LDLIBS +=	-lsmedia -lvolmgt -ladm -lefi
 
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LINTFLAGS += -u
 CPPFLAGS += -D_FILE_OFFSET_BITS=64
 
@@ -49,7 +53,7 @@ $(PROG): $(OBJS)
 	$(LINK.c) -o $(PROG) $(OBJS) $(LDLIBS)
 	$(POST_PROCESS)
 
-install: all $(ROOTPROG) 
+install: all $(ROOTPROG)
 
 clean:
 	$(RM) $(OBJS)
diff --git a/usr/src/cmd/rmmount/Makefile b/usr/src/cmd/rmmount/Makefile
index 4a075da5ef..2c6d2646af 100644
--- a/usr/src/cmd/rmmount/Makefile
+++ b/usr/src/cmd/rmmount/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		rmmount
 LOCAL_OBJS =	rmmount.o
@@ -47,6 +48,9 @@ CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-unused-function
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/rmvolmgr/Makefile b/usr/src/cmd/rmvolmgr/Makefile
index 979a41cc5c..589acaab2d 100644
--- a/usr/src/cmd/rmvolmgr/Makefile
+++ b/usr/src/cmd/rmvolmgr/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		rmvolmgr
 OBJS =		rmm_common.o rmvolmgr.o vold.o
@@ -48,6 +49,9 @@ CERRWARN += 	-_gcc=-Wno-unused-variable
 CERRWARN += 	-_gcc=-Wno-parentheses
 CERRWARN += 	-_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 ROOTCMDDIR =		$(ROOTLIB)
 ROOTMANIFESTDIR =	$(ROOTSVCSYSTEMFILESYSTEM)
 $(ROOTMANIFEST) :=	FILEMODE = 444
diff --git a/usr/src/cmd/rpcbind/Makefile b/usr/src/cmd/rpcbind/Makefile
index 96d640bc1c..ae6205f5bf 100644
--- a/usr/src/cmd/rpcbind/Makefile
+++ b/usr/src/cmd/rpcbind/Makefile
@@ -24,6 +24,7 @@
 #
 # Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		rpcbind
 MANIFEST=	bind.xml
@@ -46,6 +47,9 @@ CPPFLAGS += -D_REENTRANT
 $(RELEASE_BUILD)CPPFLAGS += -DNDEBUG
 LDLIBS += -lsocket -lnsl -lwrap -lscf -lumem
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG) $(SVCMETHOD)
diff --git a/usr/src/cmd/rpcsvc/Makefile b/usr/src/cmd/rpcsvc/Makefile
index fb78120a07..3f306e0142 100644
--- a/usr/src/cmd/rpcsvc/Makefile
+++ b/usr/src/cmd/rpcsvc/Makefile
@@ -22,8 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
-# cmd/rpcsvc/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROTOCOL_DIR= $(ROOT)/usr/include/rpcsvc
 
@@ -64,6 +63,10 @@ CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-extra
 CERRWARN += -_gcc=-Wno-unused-function
+
+# not linted
+SMATCH=off
+
 LDLIBS += -lnsl
 rusers :=	CFLAGS += $(CCVERBOSE)
 $(BINPROG) :=	LDLIBS += -lrpcsvc
diff --git a/usr/src/cmd/sa/Makefile b/usr/src/cmd/sa/Makefile
index 8e8e9bd0ce..8456d9fead 100644
--- a/usr/src/cmd/sa/Makefile
+++ b/usr/src/cmd/sa/Makefile
@@ -23,8 +23,7 @@
 # Use is subject to license terms.
 # Copyright (c) 2013 Andrew Stormont.  All rights reserved.
 #
-# cmd/sa/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 MANIFEST =	sar.xml
 SVCMETHOD =	svc-sar
@@ -36,6 +35,8 @@ ROOTMANIFESTDIR = $(ROOTSVCSYSTEM)
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+SMOFF += all_func_returns
+
 GREP=		grep
 
 SADC= 		sadc
diff --git a/usr/src/cmd/saf/Makefile b/usr/src/cmd/saf/Makefile
index 438a9d17b4..d557d52c30 100644
--- a/usr/src/cmd/saf/Makefile
+++ b/usr/src/cmd/saf/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= sac sacadm pmadm
 
@@ -61,6 +62,9 @@ CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-extra
 
+# too many untyped funcs
+SMATCH=off
+
 util1.o := CPPFLAGS += -DSAC
 util2.o := CPPFLAGS += -USAC
 
diff --git a/usr/src/cmd/sasinfo/Makefile b/usr/src/cmd/sasinfo/Makefile
index 919b3bcc78..f7c34767d9 100644
--- a/usr/src/cmd/sasinfo/Makefile
+++ b/usr/src/cmd/sasinfo/Makefile
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 include ../Makefile.cmd
 
@@ -47,6 +47,8 @@ LDLIBS += -lSMHBAAPI
 
 CERRWARN += -_gcc=-Wno-unused-value
 
+SMOFF += indenting
+
 INCS += -I.
 INCS += -I$(SRC)/lib/smhba/common
 INCS += -I$(SRC)/lib/hbaapi/common
diff --git a/usr/src/cmd/savecore/Makefile.com b/usr/src/cmd/savecore/Makefile.com
index ef8185d6d8..1f6e09b231 100644
--- a/usr/src/cmd/savecore/Makefile.com
+++ b/usr/src/cmd/savecore/Makefile.com
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= savecore
 SRCS= ../savecore.c ../../../uts/common/os/compress.c
@@ -34,6 +35,9 @@ CFLAGS += $(CCVERBOSE)
 CFLAGS64 += $(CCVERBOSE)
 CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -DBZ_NO_STDIO -I$(SRC)/uts/common
 
+# not linted
+SMATCH=off
+
 #
 # savecore is compiled with bits from $(SRC)/common/bzip2 and some function
 # symbols there are defined as weak; if you leave them out of
diff --git a/usr/src/cmd/script/Makefile b/usr/src/cmd/script/Makefile
index dc777f0841..c8f3482746 100644
--- a/usr/src/cmd/script/Makefile
+++ b/usr/src/cmd/script/Makefile
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= script
 
@@ -30,9 +31,11 @@ FILEMODE= 0555
 
 CERRWARN += -_gcc=-Wno-unused-variable
 
+SMOFF += all_func_returns
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTPROG)
 
diff --git a/usr/src/cmd/setfacl/Makefile b/usr/src/cmd/setfacl/Makefile
index 9519ffca23..5d03563af4 100644
--- a/usr/src/cmd/setfacl/Makefile
+++ b/usr/src/cmd/setfacl/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1993 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= setfacl
 
@@ -31,11 +32,14 @@ CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LDLIBS += -lsec
 
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTPROG)
 
diff --git a/usr/src/cmd/sgs/ar/Makefile.com b/usr/src/cmd/sgs/ar/Makefile.com
index dcd81c9f7c..e2064d26ea 100644
--- a/usr/src/cmd/sgs/ar/Makefile.com
+++ b/usr/src/cmd/sgs/ar/Makefile.com
@@ -20,6 +20,7 @@
 #
 #
 # Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG=		ar
@@ -42,6 +43,9 @@ CFLAGS +=	$(CCVERBOSE)
 CSTD=	$(CSTD_GNU99)
 
 CERRWARN +=	-_gcc=-Wno-uninitialized
+
+SMOFF += signed
+
 LDLIBS +=	-lelf $(CONVLIBDIR) $(CONV_LIB) -lsendfile
 LINTFLAGS=	-x
 LINTFLAGS64=	-x
diff --git a/usr/src/cmd/sgs/crle/Makefile.com b/usr/src/cmd/sgs/crle/Makefile.com
index 97855725a0..0a26a6845a 100644
--- a/usr/src/cmd/sgs/crle/Makefile.com
+++ b/usr/src/cmd/sgs/crle/Makefile.com
@@ -23,6 +23,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		crle
 
@@ -39,6 +40,9 @@ OBJS=		$(BLTOBJ) $(COMOBJ) $(TOOLSOBJ)
 MAPFILE=	$(MAPFILE.NGB)
 MAPOPT=		$(MAPFILE:%=-M%)
 
+# not linted
+SMATCH=off
+
 CPPFLAGS +=	-I$(SRC)/common/sgsrtcid -I$(SRCBASE)/uts/$(ARCH)/sys \
 		-D__EXTENSIONS__
 LLDFLAGS =	'-R$$ORIGIN/../lib'
diff --git a/usr/src/cmd/sgs/dump/Makefile.com b/usr/src/cmd/sgs/dump/Makefile.com
index 1d90361f73..4a0d909491 100644
--- a/usr/src/cmd/sgs/dump/Makefile.com
+++ b/usr/src/cmd/sgs/dump/Makefile.com
@@ -23,6 +23,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		dump
 
@@ -43,6 +44,8 @@ LDFLAGS +=	$(LLDFLAGS)
 
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+SMOFF += indenting
+
 LDLIBS +=	$(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf
 LINTFLAGS +=	-x
 LINTSRCS =	$(SRCS)
diff --git a/usr/src/cmd/sgs/elfdump/Makefile.com b/usr/src/cmd/sgs/elfdump/Makefile.com
index b24b9ef4cb..fcc0489e9f 100644
--- a/usr/src/cmd/sgs/elfdump/Makefile.com
+++ b/usr/src/cmd/sgs/elfdump/Makefile.com
@@ -21,6 +21,7 @@
 
 #
 # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG=		elfdump
@@ -60,6 +61,9 @@ LINTFLAGS64 +=	-x
 
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 BLTDEFS =	msg.h
 BLTDATA =	msg.c
 BLTMESG =	$(SGSMSGDIR)/elfdump
diff --git a/usr/src/cmd/sgs/error/i386/Makefile b/usr/src/cmd/sgs/error/i386/Makefile
index 91b26e49bc..0154fd97fa 100644
--- a/usr/src/cmd/sgs/error/i386/Makefile
+++ b/usr/src/cmd/sgs/error/i386/Makefile
@@ -24,6 +24,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		error
 
@@ -43,6 +44,8 @@ CSTD=	$(CSTD_GNU99)
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+SMOFF += no_if_block,indenting
+
 CLEANFILES +=	$(LINTOUT)
 
 %.o:		../common/%.c
diff --git a/usr/src/cmd/sgs/gprof/Makefile.com b/usr/src/cmd/sgs/gprof/Makefile.com
index cb08915388..435f86d0bd 100644
--- a/usr/src/cmd/sgs/gprof/Makefile.com
+++ b/usr/src/cmd/sgs/gprof/Makefile.com
@@ -22,8 +22,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/sgs/gprof/Makefile.com
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		gprof
 
@@ -46,6 +45,10 @@ LDLIBS +=	$(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf
 LINTSRCS =	$(SRCS)
 LINTFLAGS +=	-x
 CERRWARN +=	-_gcc=-Wno-uninitialized
+
+# not linted
+SMATCH=off
+
 CLEANFILES +=	$(LINTOUTS)
 
 ROOTLIBBLURB=	$(BLURBS:%=$(ROOTSHLIBCCS)/%)
diff --git a/usr/src/cmd/sgs/ldd/Makefile.com b/usr/src/cmd/sgs/ldd/Makefile.com
index bf52b37760..6530a3e5cb 100644
--- a/usr/src/cmd/sgs/ldd/Makefile.com
+++ b/usr/src/cmd/sgs/ldd/Makefile.com
@@ -23,6 +23,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		ldd
 
@@ -48,6 +49,8 @@ LDLIBS +=	$(CONVLIBDIR) $(CONV_LIB) -lelf $(DLLIB)
 LINTFLAGS +=	-x
 LINTFLAGS64 +=	-x
 
+SMOFF += or_vs_and
+
 BLTDEFS=        msg.h
 BLTDATA=        msg.c
 BLTMESG=        $(SGSMSGDIR)/ldd
diff --git a/usr/src/cmd/sgs/ldprof/Makefile.com b/usr/src/cmd/sgs/ldprof/Makefile.com
index 1e7a111101..f5ebebd867 100644
--- a/usr/src/cmd/sgs/ldprof/Makefile.com
+++ b/usr/src/cmd/sgs/ldprof/Makefile.com
@@ -21,6 +21,7 @@
 
 #
 # Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 LIBRARY=	ldprof.a
@@ -47,6 +48,8 @@ CPPFLAGS=	-I. -I../common -I../../include \
 		$(CPPFLAGS.master) -I$(ELFCAP)
 CFLAGS +=	$(C_PICFLAGS)
 
+SMOFF += indenting
+
 lint :=		ZRECORD =
 LDLIBS +=	$(ZRECORD) -lmapmalloc -lc $(DLLIB)
 
diff --git a/usr/src/cmd/sgs/libconv/Makefile.com b/usr/src/cmd/sgs/libconv/Makefile.com
index 1bb482f706..3f095a9aeb 100644
--- a/usr/src/cmd/sgs/libconv/Makefile.com
+++ b/usr/src/cmd/sgs/libconv/Makefile.com
@@ -91,6 +91,9 @@ include	$(SRC)/cmd/sgs/Makefile.com
 CERRWARN	+= -_gcc=-Wno-type-limits
 CERRWARN	+= -_gcc=-Wno-switch
 
+# not linted
+SMATCH=off
+
 CTFCONVERT_O=
 
 README_REVISION=../../packages/common/readme_revision
diff --git a/usr/src/cmd/sgs/libelf/Makefile.com b/usr/src/cmd/sgs/libelf/Makefile.com
index 5a6d7e0a5d..90c360940b 100644
--- a/usr/src/cmd/sgs/libelf/Makefile.com
+++ b/usr/src/cmd/sgs/libelf/Makefile.com
@@ -21,6 +21,7 @@
 #
 # Copyright 2015 Gary Mills
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 LIBRARY=	libelf.a
@@ -71,6 +72,8 @@ LINTFLAGS64 +=	-u -erroff=E_CAST_INT_TO_SMALL_INT
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+SMOFF += indenting
+
 BUILD.AR=	$(RM) $@ ; \
 		$(AR) q $@ `$(LORDER) $(OBJECTS:%=$(DIR)/%)| $(TSORT)`
 		$(POST_PROCESS_A)
diff --git a/usr/src/cmd/sgs/libld/Makefile.com b/usr/src/cmd/sgs/libld/Makefile.com
index 0141955f16..08efdd8315 100644
--- a/usr/src/cmd/sgs/libld/Makefile.com
+++ b/usr/src/cmd/sgs/libld/Makefile.com
@@ -23,6 +23,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libld.a
 VERS =		.4
@@ -94,6 +95,8 @@ CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-char-subscripts
 CERRWARN += -_gcc=-Wno-type-limits
 
+SMOFF += no_if_block
+
 # Location of the shared relocation engines maintained under usr/src/uts.
 #
 KRTLD_I386 = $(SRCBASE)/uts/$(VAR_PLAT_i386)/krtld
diff --git a/usr/src/cmd/sgs/nm/amd64/Makefile b/usr/src/cmd/sgs/nm/amd64/Makefile
index 72bbbbb1d4..d5957d006d 100644
--- a/usr/src/cmd/sgs/nm/amd64/Makefile
+++ b/usr/src/cmd/sgs/nm/amd64/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		nm
 
@@ -43,6 +44,8 @@ CPPFLAGS=	$(INCLIST) $(DEFLIST) $(CPPFLAGS.master) -I$(ELFCAP)
 
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+SMOFF += precedence,indenting
+
 LDLIBS +=	$(CONVLIBDIR64) $(CONV_LIB) $(ELFLIBDIR) -lelf
 LINTFLAGS64 +=	-x $(LDLIBS) -m64
 LINTSRCS=	$(SRCS)
diff --git a/usr/src/cmd/sgs/nm/i386/Makefile b/usr/src/cmd/sgs/nm/i386/Makefile
index f351d68aca..52920c1515 100644
--- a/usr/src/cmd/sgs/nm/i386/Makefile
+++ b/usr/src/cmd/sgs/nm/i386/Makefile
@@ -21,8 +21,7 @@
 #
 # Copyright (c) 1993, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# cmd/sgs/nm/i386/Makefile
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		nm
 XPG4PROG=	nm
@@ -47,6 +46,8 @@ CPPFLAGS=	$(INCLIST) $(DEFLIST) $(CPPFLAGS.master) -I$(ELFCAP)
 
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+SMOFF += precedence,indenting
+
 LDLIBS +=	$(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf
 LINTFLAGS +=	-x $(LDLIBS)
 LINTSRCS=	$(SRCS)
diff --git a/usr/src/cmd/sgs/prof/Makefile.com b/usr/src/cmd/sgs/prof/Makefile.com
index f35c626e36..d4d97ed062 100644
--- a/usr/src/cmd/sgs/prof/Makefile.com
+++ b/usr/src/cmd/sgs/prof/Makefile.com
@@ -22,8 +22,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/sgs/prof/Makefile.com
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		prof
 
@@ -43,6 +42,10 @@ CPPFLAGS=	$(INCLIST) $(DEFLIST) $(CPPFLAGS.master) -I$(ELFCAP)
 CFLAGS +=	$(CCVERBOSE)
 CSTD=	$(CSTD_GNU99)
 CERRWARN +=	-_gcc=-Wno-uninitialized
+
+# not linted
+SMATCH=off
+
 LDLIBS +=	$(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf
 LINTSRCS =	$(SRCS)
 LINTFLAGS +=	-x
diff --git a/usr/src/cmd/sgs/pvs/Makefile.com b/usr/src/cmd/sgs/pvs/Makefile.com
index a66d6c93b8..34755fbc99 100644
--- a/usr/src/cmd/sgs/pvs/Makefile.com
+++ b/usr/src/cmd/sgs/pvs/Makefile.com
@@ -23,6 +23,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		pvs
 
@@ -48,6 +49,9 @@ LDLIBS +=	$(LDDBGLIBDIR) $(LDDBG_LIB) $(ELFLIBDIR) -lelf \
 LINTFLAGS +=	-x
 LINTFLAGS64 +=	-x
 
+# not linted
+SMATCH=off
+
 BLTDEFS=	msg.h
 BLTDATA=	msg.c
 BLTMESG=	$(SGSMSGDIR)/pvs
diff --git a/usr/src/cmd/sgs/rtld/Makefile.com b/usr/src/cmd/sgs/rtld/Makefile.com
index 037141b7a4..22faa8f960 100644
--- a/usr/src/cmd/sgs/rtld/Makefile.com
+++ b/usr/src/cmd/sgs/rtld/Makefile.com
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 RTLD=		ld.so.1
 
@@ -89,6 +90,9 @@ CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-switch
 
+# not linted
+SMATCH=off
+
 # These definitions require that libc be built in the same workspace
 # as the run-time linker and before the run-time linker is built.
 # This is required for the system's self-consistency in any case.
@@ -100,7 +104,7 @@ LDLIBS +=	$(CONVLIBDIR) $(CONV_LIB) \
 		$(CPICLIB) $(CLIB) \
 		$(LDDBGLIBDIR) $(LDDBG_LIB) \
 		$(RTLDLIB) -lrtld \
-		$(LDLIB) $(LD_LIB) 
+		$(LDLIB) $(LD_LIB)
 
 DYNFLAGS +=	-i -e _rt_boot $(VERSREF) $(ZNODLOPEN) \
 		$(ZINTERPOSE) -zdtrace=dtrace_data '-R$$ORIGIN'
diff --git a/usr/src/cmd/sgs/tools/Makefile.com b/usr/src/cmd/sgs/tools/Makefile.com
index 6c7ba8f99d..b3180c50d2 100644
--- a/usr/src/cmd/sgs/tools/Makefile.com
+++ b/usr/src/cmd/sgs/tools/Makefile.com
@@ -18,6 +18,7 @@
 #
 # CDDL HEADER END
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 #
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
@@ -66,3 +67,6 @@ ROOTDIR=	$(ROOT)/opt/SUNWonld
 ROOTPROGS=	$(PROGS:%=$(ROOTDIR)/bin/%)
 
 FILEMODE=	0755
+
+# not linted
+SMATCH=off
diff --git a/usr/src/cmd/sgs/yacc/Makefile.com b/usr/src/cmd/sgs/yacc/Makefile.com
index 07782396a5..dca8fa416d 100644
--- a/usr/src/cmd/sgs/yacc/Makefile.com
+++ b/usr/src/cmd/sgs/yacc/Makefile.com
@@ -23,6 +23,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		yacc
 
@@ -74,6 +75,9 @@ CFLAGS64 += $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 $(ROOTPROG):= FILEMODE = 0555
 
 ROOTYACCPAR=	$(YACCPAR:%=$(ROOTSHLIBCCS)/%)
diff --git a/usr/src/cmd/sh/Makefile b/usr/src/cmd/sh/Makefile
index f1b67294ce..bb8852b978 100644
--- a/usr/src/cmd/sh/Makefile
+++ b/usr/src/cmd/sh/Makefile
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		sh
 USR_PROG =	$(PROG)
@@ -45,6 +46,10 @@ CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-extra
 CERRWARN += -_gcc=-Wno-unused-variable
+
+# unknown type for func
+SMATCH=off
+
 MAPFILES = $(MAPFILE.INT) $(MAPFILE.NGB)
 LDFLAGS += $(MAPFILES:%=-M%)
 LDLIBS += -lgen
diff --git a/usr/src/cmd/shcomp/Makefile b/usr/src/cmd/shcomp/Makefile
index 03fd752784..568d9c70f1 100644
--- a/usr/src/cmd/shcomp/Makefile
+++ b/usr/src/cmd/shcomp/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 SHELL=/usr/bin/ksh93
 
@@ -63,6 +64,8 @@ CFLAGS64 += \
 
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+SMOFF +=	all_func_returns
+
 ROOTCMDDIR=$(ROOT)/usr/bin
 
 PROG= shcomp
diff --git a/usr/src/cmd/smbsrv/smbadm/Makefile b/usr/src/cmd/smbsrv/smbadm/Makefile
index a31acdef20..bfcac47d98 100644
--- a/usr/src/cmd/smbsrv/smbadm/Makefile
+++ b/usr/src/cmd/smbsrv/smbadm/Makefile
@@ -23,6 +23,7 @@
 # Use is subject to license terms.
 #
 # Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG=	smbadm
@@ -38,6 +39,8 @@ LDFLAGS += -R/usr/lib/smbsrv
 
 CERRWARN += -_gcc=-Wno-uninitialized
 
+SMOFF += free
+
 all:		$(PROG)
 
 clean:
diff --git a/usr/src/cmd/smserverd/Makefile b/usr/src/cmd/smserverd/Makefile
index f138639025..ac01543191 100644
--- a/usr/src/cmd/smserverd/Makefile
+++ b/usr/src/cmd/smserverd/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =	rpc.smserverd
 OBJS =	smediad.o smediad_err.o myaudit.o smed_svc.o smed_xdr.o
@@ -47,6 +48,10 @@ CPPFLAGS += -D_REENTRANT
 CFLAGS += $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-unused-variable
+
+# not linted
+SMATCH=off
+
 LINTFLAGS += -u
 
 .KEEP_STATE:
diff --git a/usr/src/cmd/soelim/Makefile b/usr/src/cmd/soelim/Makefile
index 1dc7c5890b..5f70540a23 100644
--- a/usr/src/cmd/soelim/Makefile
+++ b/usr/src/cmd/soelim/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include		../Makefile.cmd
 
@@ -33,6 +34,9 @@ SRCS =		$(OBJS:%.o=%.c)
 
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 all :		$(PROG)
 
 $(PROG) :	soelim.o
diff --git a/usr/src/cmd/sort/Makefile.com b/usr/src/cmd/sort/Makefile.com
index a65ab5327a..ef195b2ce1 100644
--- a/usr/src/cmd/sort/Makefile.com
+++ b/usr/src/cmd/sort/Makefile.com
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 #
 # Debugging targets
@@ -88,6 +89,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 $(XPG4)	:=	CFLAGS += -DXPG4
 
 debug :=	SORT_DEBUG = -g -DDEBUG $(ILDOFF)
diff --git a/usr/src/cmd/sqlite/Makefile b/usr/src/cmd/sqlite/Makefile
index 795e391c96..8e9e672965 100644
--- a/usr/src/cmd/sqlite/Makefile
+++ b/usr/src/cmd/sqlite/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		sqlite
 
@@ -40,6 +41,9 @@ $(OBJS) :=	CTFCONVERT_POST = $(CTFCONVERT_O)
 
 CERRWARN +=	-_gcc=-Wno-empty-body
 
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lsqlite-sys
 
 .KEEP_STATE:
diff --git a/usr/src/cmd/stat/fsstat/Makefile b/usr/src/cmd/stat/fsstat/Makefile
index b86e2cc8f7..a1aa7a883a 100644
--- a/usr/src/cmd/stat/fsstat/Makefile
+++ b/usr/src/cmd/stat/fsstat/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG = fsstat
 OBJS = fsstat.o
@@ -40,6 +41,8 @@ FILEMODE= 0555
 
 lint := LINTFLAGS = -muxs -I$(STATCOMMONDIR)
 
+SMOFF += signed
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/stat/vmstat/Makefile b/usr/src/cmd/stat/vmstat/Makefile
index d6f65b98d0..6827f634a7 100644
--- a/usr/src/cmd/stat/vmstat/Makefile
+++ b/usr/src/cmd/stat/vmstat/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG = vmstat
 OBJS = vmstat.o
@@ -35,6 +36,9 @@ CFLAGS += $(CCVERBOSE) -I${STATCOMMONDIR}
 CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-parentheses
+
+SMOFF += signed
+
 FILEMODE= 0555
 
 lint := LINTFLAGS = -muxs -I$(STATCOMMONDIR)
diff --git a/usr/src/cmd/streams/log/Makefile b/usr/src/cmd/streams/log/Makefile
index 67909774a1..ae49471a01 100644
--- a/usr/src/cmd/streams/log/Makefile
+++ b/usr/src/cmd/streams/log/Makefile
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	strace strerr strclean
 
@@ -29,11 +30,13 @@ include ../../Makefile.cmd
 CFLAGS += $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-unused-variable
 
+SMOFF += all_func_returns
+
 FILEMODE= 0555
 
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTUSRSBINPROG)
 	-$(RM) $(ROOTBIN)/strace
diff --git a/usr/src/cmd/sulogin/Makefile b/usr/src/cmd/sulogin/Makefile
index caa77495e8..f6904820fd 100644
--- a/usr/src/cmd/sulogin/Makefile
+++ b/usr/src/cmd/sulogin/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		sulogin
 ROOTFS_PROG =	$(PROG)
@@ -32,6 +33,9 @@ LDLIBS +=	-lsecdb
 
 FILEMODE =	0555
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all:		$(ROOTFS_PROG)
diff --git a/usr/src/cmd/sunpc/other/Makefile b/usr/src/cmd/sunpc/other/Makefile
index b5434c8597..bd366ffe4e 100644
--- a/usr/src/cmd/sunpc/other/Makefile
+++ b/usr/src/cmd/sunpc/other/Makefile
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
-# cmd/sunpc/other/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= dos2unix unix2dos
 SRCS= ${PROG:%=%.c}
@@ -33,6 +33,9 @@ CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-unused-variable
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/svc/startd/Makefile b/usr/src/cmd/svc/startd/Makefile
index 0479bc97b8..1f71fdbc6c 100644
--- a/usr/src/cmd/svc/startd/Makefile
+++ b/usr/src/cmd/svc/startd/Makefile
@@ -22,6 +22,7 @@
 # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012 Milan Jurik. All rights reserved.
 # Copyright 2016 Toomas Soome <tsoome@me.com>
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG = svc.startd
@@ -72,6 +73,9 @@ CERRWARN += -_gcc=-Wno-unused-label
 CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# these look like real bugs here, but ...
+SMOFF += impossible_mask,signed_integer_overflow_check
+
 $(OBJS) := CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_REENTRANT
 
 proc.o := CPPFLAGS += -D_REENTRANT
diff --git a/usr/src/cmd/svc/svccfg/Makefile b/usr/src/cmd/svc/svccfg/Makefile
index 8fa86739a0..fc42a8b0c3 100644
--- a/usr/src/cmd/svc/svccfg/Makefile
+++ b/usr/src/cmd/svc/svccfg/Makefile
@@ -21,7 +21,7 @@
 
 #
 # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2017 Joyent, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 MYPROG =	svccfg
@@ -81,6 +81,9 @@ CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 LFLAGS = -t
 YFLAGS = -d
 
diff --git a/usr/src/cmd/svr4pkg/Makefile.svr4pkg b/usr/src/cmd/svr4pkg/Makefile.svr4pkg
index fc343556fc..ff43ccf865 100644
--- a/usr/src/cmd/svr4pkg/Makefile.svr4pkg
+++ b/usr/src/cmd/svr4pkg/Makefile.svr4pkg
@@ -24,6 +24,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include $(SRC)/cmd/Makefile.cmd
 
@@ -38,6 +39,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-address
 
+# multiple issues in this old code
+SMATCH=off
+
 LIBINST =       $(SRC)/cmd/svr4pkg/libinst/libinst.a
 
 SRCS=           $(OBJS:.o=.c)
diff --git a/usr/src/cmd/svr4pkg/libinst/Makefile b/usr/src/cmd/svr4pkg/libinst/Makefile
index 3da766690a..9abf6ebd7a 100644
--- a/usr/src/cmd/svr4pkg/libinst/Makefile
+++ b/usr/src/cmd/svr4pkg/libinst/Makefile
@@ -24,6 +24,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= libinst.a
 
@@ -68,6 +69,9 @@ CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-clobbered
 CERRWARN += -_gcc=-Wno-unused-variable
 
+# too many issues
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/swap/Makefile.com b/usr/src/cmd/swap/Makefile.com
index 0514c15e62..54361a42d5 100644
--- a/usr/src/cmd/swap/Makefile.com
+++ b/usr/src/cmd/swap/Makefile.com
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/swap/Makefile.com
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	swap
 OBJS=	$(PROG).o
@@ -35,6 +35,9 @@ CPPFLAGS +=	-D_LARGEFILE64_SOURCE
 CFLAGS64 +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 FILEMODE=02555
 
 CLEANFILES += $(OBJS)
diff --git a/usr/src/cmd/sysdef/Makefile.com b/usr/src/cmd/sysdef/Makefile.com
index 05ded4a1c8..ae6c6d58f1 100644
--- a/usr/src/cmd/sysdef/Makefile.com
+++ b/usr/src/cmd/sysdef/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	sysdef
 OBJS=	$(PROG).o sdevinfo.o
@@ -32,6 +33,9 @@ include ../../Makefile.cmd
 LDLIBS	+= -ldevinfo -lelf
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 FILEMODE= 02555
 
 CLEANFILES += $(OBJS)
diff --git a/usr/src/cmd/syslogd/Makefile.com b/usr/src/cmd/syslogd/Makefile.com
index 93b2a94dd4..0898493b3d 100644
--- a/usr/src/cmd/syslogd/Makefile.com
+++ b/usr/src/cmd/syslogd/Makefile.com
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= 		syslogd
 ROTATESCRIPT=	newsyslog
@@ -35,6 +36,10 @@ include ../../Makefile.cmd
 
 $(PROG) lint 	:= LDLIBS += -lscf -lnsl
 CERRWARN	+= -_gcc=-Wno-uninitialized
+
+# not linted
+SMATCH=off
+
 CPPFLAGS	+= -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT
 CFLAGS		+= -DNDEBUG
 
diff --git a/usr/src/cmd/tabs/Makefile b/usr/src/cmd/tabs/Makefile
index 9a5e534cc4..63d3f92983 100644
--- a/usr/src/cmd/tabs/Makefile
+++ b/usr/src/cmd/tabs/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= tabs
 
@@ -33,6 +34,9 @@ CFLAGS += $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-address
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/tail/Makefile b/usr/src/cmd/tail/Makefile
index 25a5e735db..7afc25b187 100644
--- a/usr/src/cmd/tail/Makefile
+++ b/usr/src/cmd/tail/Makefile
@@ -11,6 +11,7 @@
 
 #
 # Copyright 2010 Chris Love.  All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 
@@ -30,6 +31,8 @@ CSTD=	$(CSTD_GNU99)
 C99LMODE=	-Xc99=%all
 LINTFLAGS +=	-I. -erroff=E_CONSTANT_CONDITION
 
+SMOFF += leaks
+
 # install rules
 $(ROOTINC)/% : %
 	$(INS.file)
@@ -38,7 +41,7 @@ $(ROOTINC)/% : %
 
 .PARALLEL: $(OBJS)
 
-all:		$(PROG) 
+all:		$(PROG)
 
 $(PROG):	$(OBJS)
 	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
diff --git a/usr/src/cmd/tar/Makefile b/usr/src/cmd/tar/Makefile
index 93a02e58e0..9a026b00b4 100644
--- a/usr/src/cmd/tar/Makefile
+++ b/usr/src/cmd/tar/Makefile
@@ -20,6 +20,7 @@
 #
 #
 # Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG= tar
@@ -39,6 +40,9 @@ LDLIBS += -lsec -lcmdutils -lnvpair -ltsol
 CFLAGS += $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 CPPFLAGS += -DEUC
 
 ROOTSYMLINK=	$(ROOTPROG)
diff --git a/usr/src/cmd/tbl/Makefile b/usr/src/cmd/tbl/Makefile
index 8213f9bf01..cae02cb4f7 100644
--- a/usr/src/cmd/tbl/Makefile
+++ b/usr/src/cmd/tbl/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include		../Makefile.cmd
 
@@ -41,6 +42,9 @@ CERRWARN	+= -_gcc=-Wno-parentheses
 CERRWARN	+= -_gcc=-Wno-uninitialized
 CERRWARN	+= -_gcc=-Wno-char-subscripts
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE :
 
 all :		$(PROG)
diff --git a/usr/src/cmd/tcopy/Makefile b/usr/src/cmd/tcopy/Makefile
index d5813abe94..3e29556b5f 100644
--- a/usr/src/cmd/tcopy/Makefile
+++ b/usr/src/cmd/tcopy/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1990 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		tcopy
 
@@ -32,6 +33,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-extra
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE :
 
 all:		$(PROG) 
diff --git a/usr/src/cmd/tcpd/Makefile b/usr/src/cmd/tcpd/Makefile
index ec4d3c4876..1697a5e325 100644
--- a/usr/src/cmd/tcpd/Makefile
+++ b/usr/src/cmd/tcpd/Makefile
@@ -4,6 +4,7 @@
 #
 # Copyright 2011 Nexenta Systems, Inc. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		safe_finger tcpd tcpdchk tcpdmatch try-from
 
@@ -29,6 +30,9 @@ CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-return-type
 CERRWARN +=	-_gcc=-Wno-clobbered
 
+# not linted
+SMATCH=off
+
 # Various components must export interfaces, but also contain name-space
 # clashes with system libraries.
 MAPFILE.INT.D=	$(MAPFILE.NGB) mapfile-intf-tcpdchk
diff --git a/usr/src/cmd/tnf/prex/Makefile.com b/usr/src/cmd/tnf/prex/Makefile.com
index 6a25466978..871583d0aa 100644
--- a/usr/src/cmd/tnf/prex/Makefile.com
+++ b/usr/src/cmd/tnf/prex/Makefile.com
@@ -24,8 +24,7 @@
 # Copyright 1989,2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/tnf/prex/Makefile.com
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		prex
 
@@ -72,6 +71,9 @@ CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 .PARALLEL: $(OBJS)
diff --git a/usr/src/cmd/tnf/tnfxtract/Makefile.com b/usr/src/cmd/tnf/tnfxtract/Makefile.com
index 3916b9ca6f..dc5b2ea811 100644
--- a/usr/src/cmd/tnf/tnfxtract/Makefile.com
+++ b/usr/src/cmd/tnf/tnfxtract/Makefile.com
@@ -23,6 +23,7 @@
 # Copyright 1994, 2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		tnfxtract
 
@@ -38,6 +39,9 @@ LFLAGS=		-v
 LDLIBS +=	-lkvm
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/tput/Makefile b/usr/src/cmd/tput/Makefile
index 80cd77e8f1..7d8d338c3b 100644
--- a/usr/src/cmd/tput/Makefile
+++ b/usr/src/cmd/tput/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= tput
 
@@ -35,6 +36,9 @@ CERRWARN += -_gcc=-Wno-parentheses
 XGETFLAGS += -a -x tput.xcl
 LDLIBS +=  -lcurses
 
+# not linted
+SMATCH=off
+
 all: $(PROG)
 
 install: all $(ROOTPROG)
diff --git a/usr/src/cmd/truss/Makefile.com b/usr/src/cmd/truss/Makefile.com
index e2951b1f35..bb49c12894 100644
--- a/usr/src/cmd/truss/Makefile.com
+++ b/usr/src/cmd/truss/Makefile.com
@@ -23,8 +23,7 @@
 # Copyright (c) 2016 by Delphix. All rights reserved.
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
-#
-# cmd/truss/Makefile.com
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG=	truss
@@ -42,6 +41,9 @@ CFLAGS64	+= $(CCVERBOSE)
 CERRWARN	+= -_gcc=-Wno-uninitialized
 CERRWARN	+= -_gcc=-Wno-switch
 
+# not linted
+SMATCH=off
+
 CSTD=	$(CSTD_GNU99)
 
 LDLIBS	+= -lproc -lrtld_db -lc_db -lnsl -lsocket -ltsol -lnvpair
diff --git a/usr/src/cmd/tsol/tnd/Makefile b/usr/src/cmd/tsol/tnd/Makefile
index 247a680358..16800bac63 100644
--- a/usr/src/cmd/tsol/tnd/Makefile
+++ b/usr/src/cmd/tsol/tnd/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= tnd
 OBJS= tnd.o
@@ -47,6 +48,8 @@ CPPFLAGS += -DDEBUG
 CERRWARN += -_gcc=-Wno-unused-value
 CERRWARN += -_gcc=-Wno-parentheses
 
+SMOFF += no_if_block
+
 .KEEP_STATE:
 
 all:	$(PROG)
diff --git a/usr/src/cmd/ttymon/Makefile b/usr/src/cmd/ttymon/Makefile
index 854e5e8d95..05178e2e4c 100644
--- a/usr/src/cmd/ttymon/Makefile
+++ b/usr/src/cmd/ttymon/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= stty ttymon ttyadm sttydefs
 XPG4PROG= stty
@@ -78,6 +79,9 @@ CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-extra
 
+# not linted
+SMATCH=off
+
 #
 # Message catalog
 #
diff --git a/usr/src/cmd/units/Makefile b/usr/src/cmd/units/Makefile
index b6455296de..d68464efa9 100644
--- a/usr/src/cmd/units/Makefile
+++ b/usr/src/cmd/units/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= units
 UNITTAB=unittab
@@ -31,6 +32,9 @@ include ../Makefile.cmd
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 LIBUNITTAB= $(UNITTAB:%=$(ROOTSHLIB)/%)
 $(LIBUNITTAB) :=	FILEMODE =	$(LIBFILEMODE)
 
diff --git a/usr/src/cmd/unlink/Makefile b/usr/src/cmd/unlink/Makefile
index 78cb745acd..aa24d3401d 100644
--- a/usr/src/cmd/unlink/Makefile
+++ b/usr/src/cmd/unlink/Makefile
@@ -21,6 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= unlink
 
@@ -30,9 +31,12 @@ FILEMODE = 0555
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTUSRSBINPROG)
 	-$(RM) $(ROOTETCPROG)
diff --git a/usr/src/cmd/utmpd/Makefile b/usr/src/cmd/utmpd/Makefile
index 611c1f36dd..74a1561e64 100644
--- a/usr/src/cmd/utmpd/Makefile
+++ b/usr/src/cmd/utmpd/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= utmpd
 DEFAULTFILES= utmpd.dfl
@@ -34,6 +35,8 @@ ROOTMANIFESTDIR = $(ROOTSVCSYSTEM)
 
 FILEMODE = 555
 
+SMOFF += signed
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/vgrind/Makefile b/usr/src/cmd/vgrind/Makefile
index 0bb0619aa2..1a1eb08217 100644
--- a/usr/src/cmd/vgrind/Makefile
+++ b/usr/src/cmd/vgrind/Makefile
@@ -22,7 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/vgrind/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 #
 # These are the objects associated with the overall vgrind command.
@@ -66,6 +66,9 @@ CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN += -_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 #
 # Message catalog
 #
diff --git a/usr/src/cmd/vi/misc/Makefile b/usr/src/cmd/vi/misc/Makefile
index d124adae63..3b75bb32de 100644
--- a/usr/src/cmd/vi/misc/Makefile
+++ b/usr/src/cmd/vi/misc/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1989 by Sun Microsystems, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 CFLAGS += v
 
@@ -36,7 +37,7 @@ TXTS= READ_ME del.h.cb mkstr.c xstr.c
 POFILES= $(SRCS:%.c=%.po)
 
 include ../../Makefile.cmd
-$(XPG4) := CFLAGS += -DXPG4 
+$(XPG4) := CFLAGS += -DXPG4
 
 CERRWARN += -_gcc=-Wno-char-subscripts
 CERRWARN += -_gcc=-Wno-parentheses
@@ -44,6 +45,9 @@ CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-unused-variable
 
+# way too old
+SMATCH=off
+
 POFILE= misc.po
 
 CLOBBERFILES += $(OTHERPROGS)
diff --git a/usr/src/cmd/vi/port/Makefile b/usr/src/cmd/vi/port/Makefile
index 8c969edbe7..56cb0ca527 100644
--- a/usr/src/cmd/vi/port/Makefile
+++ b/usr/src/cmd/vi/port/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 # cmd/vi/port/Makefile
 
@@ -61,6 +62,9 @@ CERRWARN += -_gcc=-Wno-unused-value
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-address
 
+# way too old
+SMATCH=off
+
 #
 # For message catalogue files
 #
diff --git a/usr/src/cmd/volcheck/Makefile b/usr/src/cmd/volcheck/Makefile
index 8f95cb5b10..d3ee4572a1 100644
--- a/usr/src/cmd/volcheck/Makefile
+++ b/usr/src/cmd/volcheck/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		volcheck
 LOCAL_OBJS =	volcheck.o
@@ -47,6 +48,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/volrmmount/Makefile b/usr/src/cmd/volrmmount/Makefile
index f503dc768a..848088070c 100644
--- a/usr/src/cmd/volrmmount/Makefile
+++ b/usr/src/cmd/volrmmount/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		volrmmount
 LOCAL_OBJS =	volrmmount.o
@@ -47,6 +48,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/vscan/vscand/Makefile b/usr/src/cmd/vscan/vscand/Makefile
index dfc363c83d..6b4e85550d 100644
--- a/usr/src/cmd/vscan/vscand/Makefile
+++ b/usr/src/cmd/vscan/vscand/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG = vscand
 SRCS =	vs_main.c	\
@@ -46,6 +47,9 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
 
 CERRWARN += -_gcc=-Wno-switch
 
+# not linted
+SMATCH=off
+
 LINTFLAGS += -mu
 CSTD =       $(CSTD_GNU99)
 C99LMODE =      -Xc99=%all
diff --git a/usr/src/cmd/wall/Makefile b/usr/src/cmd/wall/Makefile
index 344209d5a7..f593e0095b 100644
--- a/usr/src/cmd/wall/Makefile
+++ b/usr/src/cmd/wall/Makefile
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# Copyright 2012 Joyent, Inc. All Rights Reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 PROG= wall
@@ -34,9 +34,11 @@ LDLIBS += -lzonecfg -lcontract
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+SMOFF += leaks
+
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
 install: all $(ROOTUSRSBINPROG)
 	-$(RM) $(ROOTETCPROG)
diff --git a/usr/src/cmd/whodo/amd64/Makefile b/usr/src/cmd/whodo/amd64/Makefile
index de6f95e9d1..1ca54c60d3 100644
--- a/usr/src/cmd/whodo/amd64/Makefile
+++ b/usr/src/cmd/whodo/amd64/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	whodo
 
@@ -35,6 +36,8 @@ include ../../Makefile.cmd.64
 CFLAGS64	+= $(CCVERBOSE)
 CERRWARN	+= -_gcc=-Wno-parentheses
 
+SMOFF += strcpy_overflow
+
 FILEMODE= 04555
 
 .KEEP_STATE:
diff --git a/usr/src/cmd/write/Makefile b/usr/src/cmd/write/Makefile
index 74ffb5e953..56c4911aa6 100644
--- a/usr/src/cmd/write/Makefile
+++ b/usr/src/cmd/write/Makefile
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/write/Makefile
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= write
 
@@ -38,6 +38,8 @@ XGETFLAGS += -a -x write.xcl
 CFLAGS += $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-unused-variable
 
+SMOFF += all_func_returns
+
 all: $(PROG)
 
 install: all $(ROOTPROG)
diff --git a/usr/src/cmd/xargs/Makefile b/usr/src/cmd/xargs/Makefile
index b4e136d8a6..d6491dd2bb 100644
--- a/usr/src/cmd/xargs/Makefile
+++ b/usr/src/cmd/xargs/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= 			xargs
 # /usr/xpg6/bin/xargs is a symlink to /usr/bin/xargs
@@ -38,6 +39,9 @@ LINTFLAGS += -u
 
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/ypcmd/Makefile b/usr/src/cmd/ypcmd/Makefile
index f39194c092..aeefa3031e 100644
--- a/usr/src/cmd/ypcmd/Makefile
+++ b/usr/src/cmd/ypcmd/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2015 Gary Mills
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 BINPROG = ypmatch ypwhich ypcat
@@ -153,6 +154,9 @@ CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-address
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+# too many unknown types
+SMATCH =	off
+
 #conditional assignments
 ypalias.o :=	CPPFLAGS= -DMAIN $(CPPFLAGS.master)
 makedbm.o :=	CPPFLAGS= $(CPPFLAGS.master)
diff --git a/usr/src/cmd/ypcmd/mknetid/Makefile b/usr/src/cmd/ypcmd/mknetid/Makefile
index e336bef421..853fb1ec3b 100644
--- a/usr/src/cmd/ypcmd/mknetid/Makefile
+++ b/usr/src/cmd/ypcmd/mknetid/Makefile
@@ -23,6 +23,7 @@
 # Copyright 1994, 2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG = mknetid
 
@@ -37,6 +38,9 @@ CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG) 
diff --git a/usr/src/cmd/ypcmd/revnetgroup/Makefile b/usr/src/cmd/ypcmd/revnetgroup/Makefile
index 82a979b837..7494d1ceef 100644
--- a/usr/src/cmd/ypcmd/revnetgroup/Makefile
+++ b/usr/src/cmd/ypcmd/revnetgroup/Makefile
@@ -23,6 +23,7 @@
 # Copyright 1996, 2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG = revnetgroup
 
@@ -36,6 +37,9 @@ CERRWARN += -_gcc=-Wno-implicit-function-declaration
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
@@ -46,7 +50,7 @@ $(PROG): $(OBJS)
 
 install: all $(ROOTUSRSBINPROG)
 
-clean: 
+clean:
 	$(RM) $(OBJS)
 
 lint:
diff --git a/usr/src/cmd/ypcmd/yppasswd/Makefile b/usr/src/cmd/ypcmd/yppasswd/Makefile
index 1906d7bcf7..db9d000e49 100644
--- a/usr/src/cmd/ypcmd/yppasswd/Makefile
+++ b/usr/src/cmd/ypcmd/yppasswd/Makefile
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 NETYPPROG =	rpc.yppasswdd
 DEFAULTFILES =	yppasswdd.dfl
@@ -60,6 +61,9 @@ CERRWARN +=		-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=		-_gcc=-Wno-parentheses
 CERRWARN +=		-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 #
 # Objects shared between all the major components
 #
diff --git a/usr/src/cmd/ypcmd/ypupdated/Makefile b/usr/src/cmd/ypcmd/ypupdated/Makefile
index ea5a7483ad..36f6cd4c1b 100644
--- a/usr/src/cmd/ypcmd/ypupdated/Makefile
+++ b/usr/src/cmd/ypcmd/ypupdated/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 NETYPPROG =	rpc.ypupdated
 PROG =		$(NETYPPROG)
@@ -55,6 +56,9 @@ SRCS =			$(OBJS:%.o=%.c)
 CERRWARN +=		-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=		-_gcc=-Wno-unused-variable
 
+# not linted
+SMATCH=off
+
 CLOBBERFILES += ypupdated_prot.h
 
 #conditional assignments
diff --git a/usr/src/cmd/zdb/Makefile.com b/usr/src/cmd/zdb/Makefile.com
index 1870ccd0c5..b90b5810e7 100644
--- a/usr/src/cmd/zdb/Makefile.com
+++ b/usr/src/cmd/zdb/Makefile.com
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 # Copyright (c) 2012 by Delphix. All rights reserved.
-# Copyright 2017 Joyent, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 # Copyright 2017 RackTop Systems.
 #
 
@@ -54,6 +54,8 @@ CERRWARN += -_gcc=-Wmissing-braces
 CERRWARN += -_gcc=-Wsign-compare
 CERRWARN += -_gcc=-Wmissing-field-initializers
 
+SMOFF += 64bit_shift,all_func_returns
+
 # lint complains about unused _umem_* functions
 LINTFLAGS += -xerroff=E_NAME_DEF_NOT_USED2
 LINTFLAGS64 += -xerroff=E_NAME_DEF_NOT_USED2
diff --git a/usr/src/cmd/zlogin/Makefile b/usr/src/cmd/zlogin/Makefile
index b498823b07..70ecb28c5c 100644
--- a/usr/src/cmd/zlogin/Makefile
+++ b/usr/src/cmd/zlogin/Makefile
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG = zlogin
 
@@ -33,6 +34,9 @@ FILEMODE = 0555
 
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/cmd/zonecfg/Makefile b/usr/src/cmd/zonecfg/Makefile
index e364a59679..4bb03aa97d 100644
--- a/usr/src/cmd/zonecfg/Makefile
+++ b/usr/src/cmd/zonecfg/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=	zonecfg
 OBJS=	zonecfg.o zonecfg_lex.o zonecfg_grammar.tab.o
@@ -48,6 +49,8 @@ CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 
+SMOFF += all_func_returns
+
 CLOBBERFILES += $(PROG).ln
 
 .KEEP_STATE:
diff --git a/usr/src/cmd/zonestat/zonestat/Makefile b/usr/src/cmd/zonestat/zonestat/Makefile
index 1caf1a8218..64e2314de5 100644
--- a/usr/src/cmd/zonestat/zonestat/Makefile
+++ b/usr/src/cmd/zonestat/zonestat/Makefile
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG =		zonestat
 SRCS =		zonestat.c
@@ -33,6 +34,9 @@ LINTFLAGS	+= -u
 
 CERRWARN	+= -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 .PARALLEL:
diff --git a/usr/src/cmd/zonestat/zonestatd/Makefile b/usr/src/cmd/zonestat/zonestatd/Makefile
index 169e995585..5f27190f10 100644
--- a/usr/src/cmd/zonestat/zonestatd/Makefile
+++ b/usr/src/cmd/zonestat/zonestatd/Makefile
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 MANIFEST =	zonestat.xml
 SVCMETHOD =	svc-zonestat
@@ -42,6 +43,9 @@ CERRWARN 	+= -_gcc=-Wno-parentheses
 CERRWARN 	+= -_gcc=-Wno-unused-label
 CERRWARN 	+= -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 OBJS =		$(SRCS:%.c=%.o)
 
 .KEEP_STATE:
diff --git a/usr/src/cmd/zstreamdump/Makefile b/usr/src/cmd/zstreamdump/Makefile
index ba249bafab..92d7ed4da3 100644
--- a/usr/src/cmd/zstreamdump/Makefile
+++ b/usr/src/cmd/zstreamdump/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG=		zstreamdump
 OBJS=		zstreamdump.o
@@ -47,6 +48,9 @@ LINTFLAGS64 += -xerroff=E_NAME_DEF_NOT_USED2
 
 CERRWARN += -_gcc=-Wno-switch
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 .PARALLEL:
diff --git a/usr/src/cmd/ztest/Makefile.com b/usr/src/cmd/ztest/Makefile.com
index 8f6c9d5ccf..4f0ea21a0f 100644
--- a/usr/src/cmd/ztest/Makefile.com
+++ b/usr/src/cmd/ztest/Makefile.com
@@ -22,7 +22,7 @@
 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 # Copyright 2017 RackTop Systems.
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 PROG= ztest
 OBJS= $(PROG).o
@@ -57,6 +57,9 @@ LINTFLAGS64 += -erroff=E_STATIC_UNUSED
 
 CERRWARN += -_gcc=-Wno-switch
 
+# false positive
+SMOFF += signed
+
 .KEEP_STATE:
 
 all: $(PROG)
diff --git a/usr/src/lib/auditd_plugins/binfile/Makefile.com b/usr/src/lib/auditd_plugins/binfile/Makefile.com
index f3f74d02b1..24e4d5cac0 100644
--- a/usr/src/lib/auditd_plugins/binfile/Makefile.com
+++ b/usr/src/lib/auditd_plugins/binfile/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	audit_binfile.a
 VERS=		.1
@@ -40,6 +41,9 @@ CPPFLAGS	+= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 
 CERRWARN	+= -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 ROOTLIBDIR=	$(ROOT)/usr/lib/security
 
 .KEEP_STATE:
diff --git a/usr/src/lib/auditd_plugins/syslog/Makefile.com b/usr/src/lib/auditd_plugins/syslog/Makefile.com
index 0e1c95eed9..624707fa3f 100644
--- a/usr/src/lib/auditd_plugins/syslog/Makefile.com
+++ b/usr/src/lib/auditd_plugins/syslog/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	audit_syslog.a
 VERS=		.1
@@ -50,6 +51,9 @@ CPPFLAGS	+= -I$(LIBBSM)
 CERRWARN	+= -_gcc=-Wno-char-subscripts
 CERRWARN	+= -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 ROOTLIBDIR=	$(ROOT)/usr/lib/security
 
 .KEEP_STATE:
diff --git a/usr/src/lib/brand/shared/librtld_db/Makefile.com b/usr/src/lib/brand/shared/librtld_db/Makefile.com
index dc34726f4e..30fef02f93 100644
--- a/usr/src/lib/brand/shared/librtld_db/Makefile.com
+++ b/usr/src/lib/brand/shared/librtld_db/Makefile.com
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include $(SRC)/lib/Makefile.lib
 
@@ -52,6 +53,9 @@ CPPFLAGS +=	-D_REENTRANT \
 			-I$(SRC)/cmd/sgs/include \
 			-I$(SRC)/cmd/sgs/include/$(MACH)
 
+# not linted
+SMATCH=off
+
 ROOTLIBDIR =	$(ROOT)/usr/lib/brand/$(BRAND)
 ROOTLIBDIR64 =	$(ROOT)/usr/lib/brand/$(BRAND)/$(MACH64)
 
diff --git a/usr/src/lib/cfgadm_plugins/fp/Makefile.com b/usr/src/lib/cfgadm_plugins/fp/Makefile.com
index c18d3323d3..e319918c1b 100644
--- a/usr/src/lib/cfgadm_plugins/fp/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/fp/Makefile.com
@@ -22,12 +22,12 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= fp.a
 VERS= .1
 
-OBJECTS = cfga_fp.o cfga_rcm.o cfga_cs.o cfga_utils.o 
+OBJECTS = cfga_fp.o cfga_rcm.o cfga_cs.o cfga_utils.o
 OBJECTS += cfga_cvt.o cfga_list.o cfga_rep.o
 
 # include library definitions
@@ -51,6 +51,9 @@ CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-address
 
+# not linted
+SMATCH=off
+
 CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS
 
 LINTFLAGS += -erroff=E_SEC_SPRINTF_UNBOUNDED_COPY
diff --git a/usr/src/lib/cfgadm_plugins/ib/Makefile.com b/usr/src/lib/cfgadm_plugins/ib/Makefile.com
index 185009afea..97a2a1816b 100644
--- a/usr/src/lib/cfgadm_plugins/ib/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/ib/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= ib.a
 VERS= .1
@@ -48,6 +49,9 @@ CERRWARN +=	-_gcc=-Wno-char-subscripts
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-value
 
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lc -ldevice -ldevinfo -lrcm -lnvpair
 
 .KEEP_STATE:
diff --git a/usr/src/lib/cfgadm_plugins/pci/Makefile.com b/usr/src/lib/cfgadm_plugins/pci/Makefile.com
index b53cad13f7..7abe51ddef 100644
--- a/usr/src/lib/cfgadm_plugins/pci/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/pci/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= pci.a
 VERS= .1
@@ -51,6 +52,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-char-subscripts
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/cfgadm_plugins/sbd/Makefile.com b/usr/src/lib/cfgadm_plugins/sbd/Makefile.com
index 8e6083ac46..39e160404a 100644
--- a/usr/src/lib/cfgadm_plugins/sbd/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/sbd/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= sbd.a
 VERS= .1
@@ -51,6 +52,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-char-subscripts
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 CPPFLAGS +=	-I$(ROOT)/usr/platform/$(PLATFORM)/include -DSBD_DEBUG
 #
 #	Generate the error messages form sbd_ioctl.h
diff --git a/usr/src/lib/cfgadm_plugins/scsi/Makefile.com b/usr/src/lib/cfgadm_plugins/scsi/Makefile.com
index effff0131e..0b75b01975 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/scsi/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= scsi.a
 VERS= .1
@@ -43,6 +44,9 @@ CERRWARN +=	-_gcc=-Wno-char-subscripts
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-address
 
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lc -ldevice -ldevinfo -lrcm
 
 .KEEP_STATE:
diff --git a/usr/src/lib/cfgadm_plugins/shp/Makefile.com b/usr/src/lib/cfgadm_plugins/shp/Makefile.com
index 3ba1ae337c..8771bcced3 100644
--- a/usr/src/lib/cfgadm_plugins/shp/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/shp/Makefile.com
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= shp.a
 VERS= .1
@@ -52,6 +53,9 @@ CERRWARN +=	-_gcc=-Wno-char-subscripts
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-variable
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com
index 786b37df3f..f25d1771d0 100644
--- a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include $(SRC)/lib/cfgadm_plugins/Makefile.com
 
@@ -56,6 +57,9 @@ CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/cfgadm_plugins/usb/Makefile.com b/usr/src/lib/cfgadm_plugins/usb/Makefile.com
index 9588313161..833c9a6a6d 100644
--- a/usr/src/lib/cfgadm_plugins/usb/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/usb/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= usb.a
 VERS= .1
@@ -48,6 +49,9 @@ CERRWARN +=	-_gcc=-Wno-char-subscripts
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-value
 
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lc -ldevice -ldevinfo -lrcm -lnvpair
 
 .KEEP_STATE:
diff --git a/usr/src/lib/fm/libdiskstatus/Makefile.com b/usr/src/lib/fm/libdiskstatus/Makefile.com
index ee2fa3725a..c22e5808eb 100644
--- a/usr/src/lib/fm/libdiskstatus/Makefile.com
+++ b/usr/src/lib/fm/libdiskstatus/Makefile.com
@@ -22,7 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libdiskstatus.a
 VERS=		.1
@@ -44,6 +44,9 @@ INCS +=		-I$(SRCDIR)
 LDLIBS +=	-lc -lnvpair
 CPPFLAGS +=	$(INCS)
 
+# not linted
+SMATCH=off
+
 $(LINTLIB) := SRCS=	$(SRCDIR)/$(LINTSRC)
 
 .KEEP_STATE:
diff --git a/usr/src/lib/fm/libfmd_msg/Makefile.com b/usr/src/lib/fm/libfmd_msg/Makefile.com
index a2a731da0e..31c9047656 100644
--- a/usr/src/lib/fm/libfmd_msg/Makefile.com
+++ b/usr/src/lib/fm/libfmd_msg/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY = libfmd_msg.a
 VERS = .1
@@ -42,6 +43,9 @@ CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS)
 CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS)
 CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-uninitialized
+
+SMOFF += all_func_returns
+
 LDLIBS += -lnvpair -lc
 
 LINTFLAGS = -msux
diff --git a/usr/src/lib/fm/libseslog/Makefile.com b/usr/src/lib/fm/libseslog/Makefile.com
index 980580b25a..81beeab149 100644
--- a/usr/src/lib/fm/libseslog/Makefile.com
+++ b/usr/src/lib/fm/libseslog/Makefile.com
@@ -21,12 +21,13 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 
 LIBRARY=	libseslog.a
 VERS=		.1
 
-OBJECTS=	libseslog.o 
+OBJECTS=	libseslog.o
 
 include ../../../Makefile.lib
 include ../../Makefile.lib
@@ -39,6 +40,9 @@ INCS +=		-I$(SRCDIR)
 LDLIBS +=	-lc -lnvpair
 CPPFLAGS +=	$(INCS)
 
+# not linted
+SMATCH=off
+
 $(LINTLIB) := SRCS=	$(SRCDIR)/$(LINTSRC)
 
 .KEEP_STATE:
diff --git a/usr/src/lib/fm/topo/libtopo/Makefile.com b/usr/src/lib/fm/topo/libtopo/Makefile.com
index 21ae880d59..1ab6819b98 100644
--- a/usr/src/lib/fm/topo/libtopo/Makefile.com
+++ b/usr/src/lib/fm/topo/libtopo/Makefile.com
@@ -83,6 +83,9 @@ CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 LINTFLAGS = -msux
 LINTFLAGS64 = -msux -m64
 
diff --git a/usr/src/lib/fm/topo/modules/i86pc/chip/Makefile b/usr/src/lib/fm/topo/modules/i86pc/chip/Makefile
index 5f38c3bf41..3da69e6ce2 100644
--- a/usr/src/lib/fm/topo/modules/i86pc/chip/Makefile
+++ b/usr/src/lib/fm/topo/modules/i86pc/chip/Makefile
@@ -23,7 +23,6 @@
 # Use is subject to license terms.
 #
 # Copyright (c) 2018, Joyent, Inc.
-#
 
 MODULE = chip
 ARCH = i86pc
@@ -33,3 +32,6 @@ chip_serial.c chip_smbios.c
 
 include ../../Makefile.plugin
 LDLIBS += -lipmi -lfmd_agent -lumem -lsmbios -lkstat
+
+# not linted
+SMATCH=off
diff --git a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com
index f2983bd51b..5b71525c9d 100644
--- a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 #
 # This make file will build mech_dh.so.1. This shared object
@@ -50,6 +51,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# needs work
+SMATCH=off
+
 $(PICS) := 	CFLAGS += $(XFFLAG)
 $(PICS) := 	CCFLAGS += $(XFFLAG)
 $(PICS) :=	CFLAGS64 += $(XFFLAG)
diff --git a/usr/src/lib/gss_mechs/mech_dummy/Makefile.com b/usr/src/lib/gss_mechs/mech_dummy/Makefile.com
index 04a103536b..4e46b287f7 100644
--- a/usr/src/lib/gss_mechs/mech_dummy/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_dummy/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 #
 # The mech_dummy shared object contains all the functionality needed to
@@ -43,6 +44,9 @@ CPPFLAGS +=	-I../../libgss -I$(SRC)/uts/common/gssapi/include \
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# needs work
+SMATCH=off
+
 SRCDIR =	../mech
 LIBS =		$(DYNLIB)
 LDLIBS +=	-lgss -lc
diff --git a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
index cc5f115250..f73f15c1a5 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
@@ -20,6 +20,8 @@
 #
 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
+#
 # This make file will build mech_krb5.so.1. This shared object
 # contains all the functionality needed to support the Kereros V5 GSS-API
 # mechanism. No other Kerberos libraries are needed.
@@ -262,6 +264,9 @@ CERRWARN +=	-_gcc=-Wno-unused-value
 CERRWARN +=	-_gcc=-Wno-empty-body
 CERRWARN +=	-_gcc=-Wno-address
 
+# needs work
+SMATCH=off
+
 MAPFILES =	../mapfile-vers
 
 #CPPFLAGS += 	-D_REENTRANT
diff --git a/usr/src/lib/gss_mechs/mech_spnego/Makefile.com b/usr/src/lib/gss_mechs/mech_spnego/Makefile.com
index e775560841..a3bfcc615a 100644
--- a/usr/src/lib/gss_mechs/mech_spnego/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_spnego/Makefile.com
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-
+# Copyright (c) 2018, Joyent, Inc.
 
 #
 # This make file will build mech_spnego.so.1. This shared object
@@ -48,6 +48,9 @@ CPPFLAGS += -I$(SRC)/uts/common/gssapi/include $(DEBUG) -I$(SRC)/lib/gss_mechs/m
 CERRWARN +=	-_gcc=-Wno-unused-function
 CERRWARN +=	-_gcc=-Wno-type-limits
 
+# needs work
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/hal/libhal-storage/Makefile.com b/usr/src/lib/hal/libhal-storage/Makefile.com
index 1acc45195c..e02f113d22 100644
--- a/usr/src/lib/hal/libhal-storage/Makefile.com
+++ b/usr/src/lib/hal/libhal-storage/Makefile.com
@@ -22,9 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
-# usr/src/lib/hal/libhal-storage/Makefile.com
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libhal-storage.a
 VERS =		.1.0.0
@@ -47,6 +45,8 @@ CPPFLAGS +=	-DGETTEXT_PACKAGE=\"$(HAL_GETTEXT_PACKAGE)\" -DENABLE_NLS
 CPPFLAGS +=	-DPACKAGE_LOCALE_DIR=\"/usr/lib/locale\"
 CPPFLAGS +=	-I$(ROOT)/usr/include/hal
 
+SMOFF += all_func_returns
+
 ROOTMAJLINK =	$(ROOTLIBDIR)/$(LIBRARY:.a=.so)$(VERS_MAJ)
 ROOTMAJLINK64 =	$(ROOTLIBDIR64)/$(LIBRARY:.a=.so)$(VERS_MAJ)
 
diff --git a/usr/src/lib/hal/libhal/Makefile.com b/usr/src/lib/hal/libhal/Makefile.com
index 0c9e146a7e..48657590c7 100644
--- a/usr/src/lib/hal/libhal/Makefile.com
+++ b/usr/src/lib/hal/libhal/Makefile.com
@@ -25,6 +25,7 @@
 #
 # usr/src/lib/hal/libhal/Makefile.com
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libhal.a
 VERS =		.1.0.0
@@ -44,6 +45,8 @@ CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	$(HAL_CONFIG_CPPFLAGS)
 CPPFLAGS +=	-DGETTEXT_PACKAGE=\"$(HAL_GETTEXT_PACKAGE)\" -DENABLE_NLS
 
+SMOFF += all_func_returns,leaks
+
 ROOTMAJLINK =	$(ROOTLIBDIR)/$(LIBRARY:.a=.so)$(VERS_MAJ)
 ROOTMAJLINK64 =	$(ROOTLIBDIR64)/$(LIBRARY:.a=.so)$(VERS_MAJ)
 
diff --git a/usr/src/lib/hbaapi/Makefile.com b/usr/src/lib/hbaapi/Makefile.com
index 9dc4272593..cc38763048 100644
--- a/usr/src/lib/hbaapi/Makefile.com
+++ b/usr/src/lib/hbaapi/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 
 LIBRARY =	libHBAAPI.a
@@ -45,6 +46,9 @@ CERRWARN +=	-_gcc=-Wno-unused-value
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lc
 
 $(LINTLIB) := SRCS=	$(SRCDIR)/$(LINTSRC)
diff --git a/usr/src/lib/iconv_modules/hi_IN/Makefile.com b/usr/src/lib/iconv_modules/hi_IN/Makefile.com
index ced4ae69a5..2a1d4996f4 100644
--- a/usr/src/lib/iconv_modules/hi_IN/Makefile.com
+++ b/usr/src/lib/iconv_modules/hi_IN/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 SRCS	=	iscii91%UTF-8.c \
 		UTF-8%iscii91.c \
@@ -36,4 +37,7 @@ include $(SRC)/lib/iconv_modules/Makefile.iconv
 
 CFLAGS += -I../include
 
+# needs work
+SMOFF += index_overflow
+
 all: $(PROGS)
diff --git a/usr/src/lib/iconv_modules/ja/Makefile.com b/usr/src/lib/iconv_modules/ja/Makefile.com
index bf8a026394..a7e10f6fed 100644
--- a/usr/src/lib/iconv_modules/ja/Makefile.com
+++ b/usr/src/lib/iconv_modules/ja/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include $(SRC)/Makefile.master
 
@@ -34,6 +35,9 @@ LIB64 = $(MODULES:%.c=$(MACH64)/%.so)
 
 LDLIBS=	-lc
 
+# needs work
+SMATCH=off
+
 INSTALL_MODULES = .modules_installed
 CLEANFILES += $(INSTALL_MODULES)
 
diff --git a/usr/src/lib/iconv_modules/ko/Makefile.com b/usr/src/lib/iconv_modules/ko/Makefile.com
index 252771e423..25ae7bb98e 100644
--- a/usr/src/lib/iconv_modules/ko/Makefile.com
+++ b/usr/src/lib/iconv_modules/ko/Makefile.com
@@ -22,6 +22,8 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+
 
 include $(SRC)/lib/iconv_modules/Makefile.iconv
 
@@ -92,6 +94,9 @@ ALL_SOS   = $(E2I) $(I2E) $(E2J92) $(J922E) $(E2J) $(J2E) $(E2NB) $(NB2E) \
 LDFLAGS = $(DYNFLAGS) $(LDLIBS) $(CFLAG_OPT)
 CFLAGS += -I$(ICONV_COMMON) -I../inc
 
+# needs work
+SMATCH=off
+
 LINK_TARGETS = $(U2UH) $(C9332U) $(UH2U) $(E2U) $(I2U) $(O2U) $(N2U) \
 	$(E2I) $(E2J) $(E2J92) $(E2NB) $(I2E) $(J2E) $(J922E) $(NVBE) \
 	$(UCS2BE2UH) $(U2LE2UH) $(U2C933) $(U2E) $(U2I) $(U2O) $(U2N) \
diff --git a/usr/src/lib/iconv_modules/utf-8/Makefile.com b/usr/src/lib/iconv_modules/utf-8/Makefile.com
index f674e3a392..2136e0ea66 100644
--- a/usr/src/lib/iconv_modules/utf-8/Makefile.com
+++ b/usr/src/lib/iconv_modules/utf-8/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include $(SRC)/Makefile.master
 
@@ -75,6 +76,9 @@ LDLIBS			= -lc
 
 LDFLAGS = $(DYNFLAGS) $(LDLIBS) $(CFLAG_OPT)
 
+# needs work
+SMATCH=off
+
 $(DYNOBJS)		:= CFLAGS += $(XREGSFLAG) $(C_PICFLAGS) -D_REENTRANT \
 					-I$(COMMON) -I$(COMMON)/tbls \
 					-I$(ADJUNCT_PROTO)/usr/include
diff --git a/usr/src/lib/iconv_modules/vi/Makefile.com b/usr/src/lib/iconv_modules/vi/Makefile.com
index 3c773932e6..c3d8d12904 100644
--- a/usr/src/lib/iconv_modules/vi/Makefile.com
+++ b/usr/src/lib/iconv_modules/vi/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 SRCS		=	tcvn%UCS-2.c \
             tcvn%UTF-8.c \
@@ -38,6 +39,9 @@ COMMON = ../common/
 LINK_TARGETS  = UCS-2BE%tcvn.so tcvn%UCS-2BE.so
 LINK_TARGETS += UCS-2BE%viscii.so viscii%UCS-2BE.so
 
+# needs work
+SMOFF += all_func_returns,deref_check
+
 dummy: all
 
 tcvn%UCS-2LE.o: $(COMMON)tcvn%UCS-2.c
diff --git a/usr/src/lib/iconv_modules/zh/Makefile.com b/usr/src/lib/iconv_modules/zh/Makefile.com
index 65523522fd..741b71d069 100644
--- a/usr/src/lib/iconv_modules/zh/Makefile.com
+++ b/usr/src/lib/iconv_modules/zh/Makefile.com
@@ -22,9 +22,13 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LDFLAGS	=	$(DYNFLAGS) $(LDLIBS)
 
+# needs work
+SMATCH=off
+
 COMMON = ../common/
 
 ICONV_COMMON  = ../../common/
diff --git a/usr/src/lib/krb5/dyn/Makefile.com b/usr/src/lib/krb5/dyn/Makefile.com
index 501893d8c6..0036b363b4 100644
--- a/usr/src/lib/krb5/dyn/Makefile.com
+++ b/usr/src/lib/krb5/dyn/Makefile.com
@@ -22,6 +22,8 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
+
 
 LIBRARY= libdyn.a
 VERS= .1
@@ -63,6 +65,8 @@ LDLIBS +=	-lc
 
 CERRWARN +=	-_gcc=-Wno-unused-variable
 
+SMOFF += no_if_block
+
 .KEEP_STATE:
 
 all:	$(LIBS)
diff --git a/usr/src/lib/krb5/kadm5/clnt/Makefile.com b/usr/src/lib/krb5/kadm5/clnt/Makefile.com
index 44d13ddcc5..ba382f0ce9 100644
--- a/usr/src/lib/krb5/kadm5/clnt/Makefile.com
+++ b/usr/src/lib/krb5/kadm5/clnt/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= libkadm5clnt.a
 VERS= .1
@@ -86,6 +87,8 @@ CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+SMOFF += all_func_returns,indenting,no_if_block
+
 LDLIBS +=	-lc
 
 .KEEP_STATE:
diff --git a/usr/src/lib/krb5/kadm5/srv/Makefile.com b/usr/src/lib/krb5/kadm5/srv/Makefile.com
index 96d3aba6e6..2f5a4eda60 100644
--- a/usr/src/lib/krb5/kadm5/srv/Makefile.com
+++ b/usr/src/lib/krb5/kadm5/srv/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= libkadm5srv.a
 VERS= .1
@@ -93,6 +94,8 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-type-limits
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+SMOFF += all_func_returns,indenting
+
 .KEEP_STATE:
 
 all:	$(LIBS)
diff --git a/usr/src/lib/krb5/kdb/Makefile.com b/usr/src/lib/krb5/kdb/Makefile.com
index b75f6e5e3e..608756d463 100644
--- a/usr/src/lib/krb5/kdb/Makefile.com
+++ b/usr/src/lib/krb5/kdb/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= libkdb.a
 VERS= .1
@@ -87,6 +88,8 @@ CERRWARN +=	-_gcc=-Wno-type-limits
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+SMOFF += indenting,all_func_returns,deref_check,signed
+
 DYNFLAGS +=	$(KRUNPATH) $(KMECHLIB)
 LDLIBS +=	-lc -lnsl
 
diff --git a/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com b/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com
index 064c9d7e4b..e44ff025be 100644
--- a/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com
+++ b/usr/src/lib/krb5/plugins/kdb/db2/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= db2.a
 VERS= .1
@@ -69,6 +70,9 @@ CERRWARN +=	-_gcc=-Wno-unused-function
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 DYNFLAGS +=	$(KRUNPATH) $(KERBRUNPATH) $(KMECHLIB)
 LDLIBS +=	-L $(ROOTLIBDIR) -ldb2 -lkdb -lkadm5srv -lc -lnsl
 
diff --git a/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile.com b/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile.com
index aec2ac074b..0fbc9900e9 100644
--- a/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile.com
+++ b/usr/src/lib/krb5/plugins/kdb/db2/libdb2/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= libdb2.a
 VERS= .1
@@ -102,6 +103,10 @@ CPPFLAGS += 	-DHAVE_CONFIG_H \
 
 CFLAGS +=	$(CCVERBOSE) -I..
 CERRWARN +=	-_gcc=-Wno-uninitialized
+
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lc
 
 # Identify that this library is an interposer (on dbm_ routines from libc.so.1).
diff --git a/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile.com b/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile.com
index 0f094f2b4d..a3751a8a9b 100644
--- a/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile.com
+++ b/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= libkdb_ldap.a
 VERS= .1
@@ -76,6 +77,10 @@ CPPFLAGS += 	-DHAVE_CONFIG_H \
 CFLAGS +=	$(CCVERBOSE) -I..
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-unused-function
+
+# not linted
+SMATCH=off
+
 DYNFLAGS +=	$(KRUNPATH) $(KERBRUNPATH) $(KMECHLIB)
 LDLIBS +=	-L $(ROOTLIBDIR) -lkadm5srv -lc -lnsl -lldap
 
diff --git a/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com b/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com
index 07fcb2bbf7..6cf5b5dc2b 100644
--- a/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com
+++ b/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= pkinit.a
 VERS= .1
@@ -68,6 +68,9 @@ CPPFLAGS += 	-I$(SRC)/lib/krb5 \
 CERRWARN	+= -_gcc=-Wno-uninitialized
 CERRWARN	+= -_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 CFLAGS +=	$(CCVERBOSE) -I..
 DYNFLAGS +=	$(KRUNPATH) $(KMECHLIB) -znodelete
 LDLIBS +=	-L $(ROOTLIBDIR) -lsunw_crypto -lc
diff --git a/usr/src/lib/krb5/ss/Makefile.com b/usr/src/lib/krb5/ss/Makefile.com
index 424c5293d4..e8a090776a 100644
--- a/usr/src/lib/krb5/ss/Makefile.com
+++ b/usr/src/lib/krb5/ss/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= libss.a
 VERS= .1
@@ -69,6 +70,8 @@ CFLAGS +=	$(CCVERBOSE) -I..
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-unused-variable
 
+SMOFF += all_func_returns
+
 DYNFLAGS +=	$(KRUNPATH) $(KMECHLIB) $(ZIGNORE)
 
 LDLIBS +=	-lc -ltecla
diff --git a/usr/src/lib/libadm/Makefile.com b/usr/src/lib/libadm/Makefile.com
index 4631c50bf4..9896df06ba 100644
--- a/usr/src/lib/libadm/Makefile.com
+++ b/usr/src/lib/libadm/Makefile.com
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libadm.a
 VERS=		.1
@@ -47,6 +48,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-char-subscripts
 
+# not linted
+SMATCH=off
+
 $(LINTLIB) :=	SRCS=$(SRCDIR)/$(LINTSRC)
 LDLIBS +=	-lc
 
diff --git a/usr/src/lib/libadt_jni/Makefile.com b/usr/src/lib/libadt_jni/Makefile.com
index 658a114f8e..eb72d00d79 100644
--- a/usr/src/lib/libadt_jni/Makefile.com
+++ b/usr/src/lib/libadt_jni/Makefile.com
@@ -22,8 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libadt_jni.a
 VERS=		.1
@@ -40,6 +39,9 @@ SRCDIR =	../common
 CPPFLAGS +=	-I$(JAVA_ROOT)/include -I$(JAVA_ROOT)/include/solaris
 CPPFLAGS +=	-D_REENTRANT
 
+# not linted
+SMATCH=off
+
 DYNFLAGS +=
 LDLIBS +=	-lc -lbsm
 
diff --git a/usr/src/lib/libadutils/Makefile.com b/usr/src/lib/libadutils/Makefile.com
index 7d7e142481..4d2f9cd5ae 100644
--- a/usr/src/lib/libadutils/Makefile.com
+++ b/usr/src/lib/libadutils/Makefile.com
@@ -24,6 +24,7 @@
 #
 # Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libadutils.a
 VERS =		.1
@@ -47,6 +48,9 @@ CPPFLAGS +=	-I$(SRC)/lib/libldap5/include/ldap
 CERRWARN +=	-_gcc=-Wno-type-limits
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libbsdmalloc/Makefile.com b/usr/src/lib/libbsdmalloc/Makefile.com
index d58fd9e383..9732e9b2b5 100644
--- a/usr/src/lib/libbsdmalloc/Makefile.com
+++ b/usr/src/lib/libbsdmalloc/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libbsdmalloc.a
 VERS=		.1
@@ -53,6 +54,9 @@ CPPFLAGS +=	-D_REENTRANT
 DYNFLAGS +=     $(ZINTERPOSE)
 LDLIBS +=       -lc
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 lint:
diff --git a/usr/src/lib/libbsm/Makefile.com b/usr/src/lib/libbsm/Makefile.com
index 0d5bc4976d..86449984c6 100644
--- a/usr/src/lib/libbsm/Makefile.com
+++ b/usr/src/lib/libbsm/Makefile.com
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libbsm.a
 VERS = 		.1
@@ -88,6 +89,9 @@ LDLIBS +=	-lsocket -lnsl -lmd -lc -lsecdb -ltsol -linetutil -lscf
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 COMDIR=		../common
 AUDITD=		$(SRC)/cmd/auditd
 
diff --git a/usr/src/lib/libc_db/Makefile.com b/usr/src/lib/libc_db/Makefile.com
index 60f1f0cd96..36c954e36c 100644
--- a/usr/src/lib/libc_db/Makefile.com
+++ b/usr/src/lib/libc_db/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY = libc_db.a
 VERS = .1
@@ -49,6 +50,9 @@ LDLIBS +=	-lc
 CERRWARN +=	-_gcc=-Wno-type-limits
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libcfgadm/Makefile.com b/usr/src/lib/libcfgadm/Makefile.com
index 55747cb387..d246e9a0e7 100644
--- a/usr/src/lib/libcfgadm/Makefile.com
+++ b/usr/src/lib/libcfgadm/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libcfgadm.a
 VERS =		.1
@@ -39,6 +40,8 @@ CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-type-limits
 CERRWARN +=	-_gcc=-Wno-unused-label
 
+SMOFF += snprintf_overflow
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libcmd/Makefile.com b/usr/src/lib/libcmd/Makefile.com
index c3725e124b..d5e09b13c8 100644
--- a/usr/src/lib/libcmd/Makefile.com
+++ b/usr/src/lib/libcmd/Makefile.com
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 
 SHELL=/usr/bin/ksh93
@@ -138,6 +139,9 @@ CERRWARN	+= -_gcc=-Wno-uninitialized
 CERRWARN	+= -_gcc=-Wno-unused-variable
 CERRWARN	+= -_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 pics/cut.o	:= CERRWARN += -erroff=E_END_OF_LOOP_CODE_NOT_REACHED
 pics/sync.o	:= CERRWARN += -erroff=E_END_OF_LOOP_CODE_NOT_REACHED
 pics/vmstate.o	:= CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED
diff --git a/usr/src/lib/libcpc/Makefile.com b/usr/src/lib/libcpc/Makefile.com
index 428955e904..8e95766942 100644
--- a/usr/src/lib/libcpc/Makefile.com
+++ b/usr/src/lib/libcpc/Makefile.com
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY = libcpc.a
 VERS	= .1
@@ -48,6 +49,9 @@ CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libcryptoutil/Makefile.com b/usr/src/lib/libcryptoutil/Makefile.com
index b6df76e3c4..79eab46787 100644
--- a/usr/src/lib/libcryptoutil/Makefile.com
+++ b/usr/src/lib/libcryptoutil/Makefile.com
@@ -20,6 +20,7 @@
 #
 # Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= libcryptoutil.a
 VERS=	.1
@@ -54,6 +55,9 @@ LINTFLAGS64 +=  -errchk=longptr64
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 all: $(LIBS)
 
 lint: lintcheck
diff --git a/usr/src/lib/libcurses/Makefile.com b/usr/src/lib/libcurses/Makefile.com
index b295f4b536..b3b7a2da0e 100644
--- a/usr/src/lib/libcurses/Makefile.com
+++ b/usr/src/lib/libcurses/Makefile.com
@@ -23,6 +23,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libcurses.a
 VERS=	.1
@@ -152,6 +153,9 @@ CERRWARN +=	-_gcc=-Wno-char-subscripts
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 LDLIBS += -lc
 
 CPPFLAGS += -I../screen -I../../common/inc
diff --git a/usr/src/lib/libcustr/Makefile b/usr/src/lib/libcustr/Makefile
index 19b08dc521..c89032e534 100644
--- a/usr/src/lib/libcustr/Makefile
+++ b/usr/src/lib/libcustr/Makefile
@@ -27,6 +27,9 @@ clobber :=	TARGET= clobber
 install :=	TARGET= install
 lint :=		TARGET= lint
 
+# needs work
+SMOFF=all_func_returns
+
 .KEEP_STATE:
 
 all clean clobber install lint: $(SUBDIRS)
diff --git a/usr/src/lib/libdevinfo/Makefile.com b/usr/src/lib/libdevinfo/Makefile.com
index 690d2aea59..4567bc289f 100644
--- a/usr/src/lib/libdevinfo/Makefile.com
+++ b/usr/src/lib/libdevinfo/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libdevinfo.a
 VERS=		.1
@@ -43,6 +44,9 @@ CPPFLAGS +=	-I..
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libdhcpagent/Makefile.com b/usr/src/lib/libdhcpagent/Makefile.com
index c01532cac2..c62f6c26c2 100644
--- a/usr/src/lib/libdhcpagent/Makefile.com
+++ b/usr/src/lib/libdhcpagent/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY	=	libdhcpagent.a
 VERS =		.1
@@ -39,9 +40,12 @@ LDLIBS +=	-lc -lsocket -ldhcputil -luuid -ldlpi -lcontract
 SRCDIR =	../common
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-CFLAGS += 	$(CCVERBOSE) 
+CFLAGS += 	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-type-limits
 
+# needs work
+SMOFF += allocating_enough_data
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libdhcputil/Makefile.com b/usr/src/lib/libdhcputil/Makefile.com
index b32dc645ce..b8e2721122 100644
--- a/usr/src/lib/libdhcputil/Makefile.com
+++ b/usr/src/lib/libdhcputil/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libdhcputil.a
 VERS =		.1
@@ -48,6 +49,9 @@ CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CPPFLAGS +=	-I$(COMDIR)
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libdisasm/Makefile.com b/usr/src/lib/libdisasm/Makefile.com
index 2afa0e3499..3e08026f68 100644
--- a/usr/src/lib/libdisasm/Makefile.com
+++ b/usr/src/lib/libdisasm/Makefile.com
@@ -123,6 +123,9 @@ $(LINTLIB) := SRCS = $(COMDIR)/$(LINTSRC)
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 # We want the thread-specific errno in the library, but we don't want it in
 # the standalone.  $(DTS_ERRNO) is designed to add -D_TS_ERRNO to $(CPPFLAGS),
 # in order to enable this feature.  Conveniently, -D_REENTRANT does the same
diff --git a/usr/src/lib/libdiskmgt/Makefile.com b/usr/src/lib/libdiskmgt/Makefile.com
index 4a8ee2069c..ee8dee6344 100644
--- a/usr/src/lib/libdiskmgt/Makefile.com
+++ b/usr/src/lib/libdiskmgt/Makefile.com
@@ -23,8 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 # Copyright 2016 Nexenta Systems, Inc.
-# Copyright 2018 Joyent, Inc.
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libdiskmgt.a
 VERS =		.1
@@ -66,6 +65,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CPPFLAGS +=	-D_REENTRANT -I$(SRC)/lib/libdiskmgt/common
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libdladm/Makefile.com b/usr/src/lib/libdladm/Makefile.com
index f9270f9769..86b60f468b 100644
--- a/usr/src/lib/libdladm/Makefile.com
+++ b/usr/src/lib/libdladm/Makefile.com
@@ -20,7 +20,7 @@
 #
 #
 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2015, Joyent, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 LIBRARY = libdladm.a
@@ -50,8 +50,8 @@ CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CPPFLAGS +=	-I$(SRCDIR) -D_REENTRANT
 
-C99MODE=	-xc99=%all
-C99LMODE=	-Xc99=%all
+# not linted
+SMATCH=off
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/libdll/Makefile.com b/usr/src/lib/libdll/Makefile.com
index 745aabb9f1..67411c3487 100644
--- a/usr/src/lib/libdll/Makefile.com
+++ b/usr/src/lib/libdll/Makefile.com
@@ -23,6 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 SHELL=/usr/bin/ksh93
 
@@ -86,6 +87,9 @@ CFLAGS64 += \
 CERRWARN	+= -_gcc=-Wno-parentheses
 CERRWARN	+= -_gcc=-Wno-uninitialized
 
+# needs work
+SMOFF += all_func_returns,strcpy_overflow
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libdns_sd/Makefile.com b/usr/src/lib/libdns_sd/Makefile.com
index 217ef72c05..84dfcd0c5e 100644
--- a/usr/src/lib/libdns_sd/Makefile.com
+++ b/usr/src/lib/libdns_sd/Makefile.com
@@ -22,6 +22,7 @@
 # Use is subject to license terms.
 # Copyright 2016 Toomas Soome <tsoome@me.com>
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libdns_sd.a
 VERS =		.1
@@ -41,6 +42,9 @@ CPPFLAGS +=	-DMDNS_VERSIONSTR_NODTS
 
 pics/dnssd_clientstub.o := CERRWARN +=	-_gcc=-Wno-unused-but-set-variable
 
+# not linted
+SMATCH=off
+
 .PARALLEL =     $(OBJECTS)
 .KEEP_STATE:
 
diff --git a/usr/src/lib/libdtrace/Makefile.com b/usr/src/lib/libdtrace/Makefile.com
index d8aa13e4dc..ed46637115 100644
--- a/usr/src/lib/libdtrace/Makefile.com
+++ b/usr/src/lib/libdtrace/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2011, 2016 by Delphix. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY = libdtrace.a
 VERS = .1
@@ -105,7 +106,7 @@ DLIBSRCS += \
 
 include ../../Makefile.lib
 
-SRCS = $(LIBSRCS:%.c=../common/%.c) $(LIBISASRCS:%.c=../$(MACH)/%.c) 
+SRCS = $(LIBSRCS:%.c=../common/%.c) $(LIBISASRCS:%.c=../$(MACH)/%.c)
 LIBS = $(DYNLIB) $(LINTLIB)
 
 SRCDIR = ../common
@@ -135,6 +136,9 @@ CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-switch
 
+# not linted
+SMATCH=off
+
 YYCFLAGS =
 LDLIBS += -lgen -lproc -lrtld_db -lnsl -lsocket -lctf -lelf -lc -lzonecfg
 DRTILDLIBS = $(LDLIBS.lib) -lc
diff --git a/usr/src/lib/libdtrace_jni/Makefile.com b/usr/src/lib/libdtrace_jni/Makefile.com
index 471746866f..00813b4442 100644
--- a/usr/src/lib/libdtrace_jni/Makefile.com
+++ b/usr/src/lib/libdtrace_jni/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY = libdtrace_jni.a
 VERS = .1
@@ -51,6 +52,8 @@ CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS64)
 
 CERRWARN += -_gcc=-Wno-uninitialized
 
+SMOFF += all_func_returns
+
 LDLIBS += -lc -luutil -ldtrace -lproc
 
 LINTLIB =
diff --git a/usr/src/lib/libefi/Makefile.com b/usr/src/lib/libefi/Makefile.com
index 3fc915acdd..c0108f5f85 100644
--- a/usr/src/lib/libefi/Makefile.com
+++ b/usr/src/lib/libefi/Makefile.com
@@ -23,6 +23,7 @@
 # Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libefi.a
 VERS =		.1
@@ -42,6 +43,8 @@ CFLAGS +=	$(CCVERBOSE)
 
 LINTFLAGS64 +=	-errchk=longptr64
 
+SMOFF += kmalloc_wrong_size
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libfdisk/Makefile.com b/usr/src/lib/libfdisk/Makefile.com
index d2ac8d3d39..27079153c4 100644
--- a/usr/src/lib/libfdisk/Makefile.com
+++ b/usr/src/lib/libfdisk/Makefile.com
@@ -22,8 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# Copyright 2018 Joyent, Inc.
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= libfdisk.a
 VERS= .1
@@ -55,6 +54,9 @@ LINTFLAGS64 +=    -erroff=E_BAD_PTR_CAST_ALIGN
 
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libficl/Makefile.com b/usr/src/lib/libficl/Makefile.com
index b4532d2ed9..2a077c47ee 100644
--- a/usr/src/lib/libficl/Makefile.com
+++ b/usr/src/lib/libficl/Makefile.com
@@ -12,6 +12,7 @@
 #
 # Copyright 2016 Toomas Soome <tsoome@me.com>
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=libficl-sys.a
 MAJOR = 4
@@ -40,6 +41,9 @@ pics/vm.o := CERRWARN += -_gcc=-Wno-clobbered
 
 LDLIBS +=	-luuid -lz -lc -lm -lumem
 
+# not linted
+SMATCH=off
+
 HEADERS= $(FICLDIR)/ficl.h $(FICLDIR)/ficltokens.h ../ficllocal.h \
 	$(FICLDIR)/ficlplatform/unix.h $(PNGLITE)/pnglite.h
 
diff --git a/usr/src/lib/libfru/libfruraw/Makefile.com b/usr/src/lib/libfru/libfruraw/Makefile.com
index 76bdea8a36..92b14c7756 100644
--- a/usr/src/lib/libfru/libfruraw/Makefile.com
+++ b/usr/src/lib/libfru/libfruraw/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libfruraw.a
 VERS=		.1
@@ -54,6 +55,9 @@ CFLAGS +=	$(CCVERBOSE)
 
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 $(LINTLIB) :=	LINTFLAGS = -nvx -I..
 $(LINTLIB) :=	LINTFLAGS64 = -nvx -m64 -I..
 
diff --git a/usr/src/lib/libfsmgt/Makefile.com b/usr/src/lib/libfsmgt/Makefile.com
index c9143741ac..3c2db0f981 100644
--- a/usr/src/lib/libfsmgt/Makefile.com
+++ b/usr/src/lib/libfsmgt/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libfsmgt.a
 VERS =		.1
@@ -54,6 +55,9 @@ CPPFLAGS +=	-D_REENTRANT -I$(SRC)/lib/libfsmgt/common \
 CERRWARN	+= -_gcc=-Wno-parentheses
 CERRWARN	+= -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 CLOBBERFILES	+= $(SRCDIR)/nfs_sec.c
 CLOBBERFILES	+= $(SRCDIR)/replica.c
 CLOBBERFILES	+= $(SRCDIR)/sharetab.c
diff --git a/usr/src/lib/libgen/Makefile.com b/usr/src/lib/libgen/Makefile.com
index 52bace544f..5fbf71233f 100644
--- a/usr/src/lib/libgen/Makefile.com
+++ b/usr/src/lib/libgen/Makefile.com
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libgen.a
 VERS =		.1
@@ -46,6 +47,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-char-subscripts
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libgss/Makefile.com b/usr/src/lib/libgss/Makefile.com
index d1d34bd48a..fa824b1cb8 100644
--- a/usr/src/lib/libgss/Makefile.com
+++ b/usr/src/lib/libgss/Makefile.com
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY = libgss.a
 VERS = .1
@@ -111,6 +112,9 @@ CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-empty-body
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libima/Makefile.com b/usr/src/lib/libima/Makefile.com
index cf7cea4fc6..7e2b2eaa16 100644
--- a/usr/src/lib/libima/Makefile.com
+++ b/usr/src/lib/libima/Makefile.com
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libima.a
 VERS=		.1
@@ -52,6 +52,9 @@ CFLAGS64 +=       -DSOLARIS
 
 CERRWARN +=	-_gcc=-Wno-unused-variable
 
+# not linted
+SMATCH=off
+
 LINTFLAGS += -DSOLARIS
 LINTFLAGS64 += -DSOLARIS
 
diff --git a/usr/src/lib/libinetsvc/Makefile.com b/usr/src/lib/libinetsvc/Makefile.com
index 4d12fdc942..9505796f00 100644
--- a/usr/src/lib/libinetsvc/Makefile.com
+++ b/usr/src/lib/libinetsvc/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libinetsvc.a
 VERS =		.1
@@ -43,6 +44,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libinetutil/Makefile.com b/usr/src/lib/libinetutil/Makefile.com
index d22ab84726..d73fecb5ef 100644
--- a/usr/src/lib/libinetutil/Makefile.com
+++ b/usr/src/lib/libinetutil/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY = libinetutil.a
 VERS = 	  .1
@@ -48,6 +49,8 @@ CPPFLAGS +=	-I$(SRCDIR)
 
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+SMOFF += index_overflow
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libinstzones/Makefile.com b/usr/src/lib/libinstzones/Makefile.com
index b00c58f370..2fa0b68803 100644
--- a/usr/src/lib/libinstzones/Makefile.com
+++ b/usr/src/lib/libinstzones/Makefile.com
@@ -23,6 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libinstzones.a
 VERS=		.1
@@ -57,6 +58,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-clobbered
 CERRWARN +=	-_gcc=-Wno-address
 
+# not linted
+SMATCH=off
+
 LIBS = $(DYNLIB) $(LINTLIB)
 
 DYNFLAGS += $(ZLAZYLOAD)
diff --git a/usr/src/lib/libipadm/Makefile.com b/usr/src/lib/libipadm/Makefile.com
index 255dc3125b..c2671ea571 100644
--- a/usr/src/lib/libipadm/Makefile.com
+++ b/usr/src/lib/libipadm/Makefile.com
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2016, Chris Fraire <cfraire@me.com>.
-#
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 LIBRARY = libipadm.a
@@ -46,6 +46,9 @@ CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CPPFLAGS +=	-I$(SRCDIR) -D_REENTRANT
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all:		$(LIBS)
diff --git a/usr/src/lib/libipsecutil/Makefile.com b/usr/src/lib/libipsecutil/Makefile.com
index aef11c9c76..9e828a0476 100644
--- a/usr/src/lib/libipsecutil/Makefile.com
+++ b/usr/src/lib/libipsecutil/Makefile.com
@@ -47,6 +47,8 @@ CPPFLAGS +=	-I$(SRCDIR) -I$(BERDIR)
 CERRWARN +=	-_gcc=-Wno-unused-function
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+SMOFF += shift_to_zero
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libkmf/ber_der/Makefile.com b/usr/src/lib/libkmf/ber_der/Makefile.com
index 6654e7cfde..72576bb97e 100644
--- a/usr/src/lib/libkmf/ber_der/Makefile.com
+++ b/usr/src/lib/libkmf/ber_der/Makefile.com
@@ -21,6 +21,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= libkmfberder.a
 VERS= .1
@@ -51,6 +52,9 @@ LDLIBS		+=	-lc
 
 CERRWARN	+=	-_gcc=-Wno-unused-label
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all:    $(LIBS)
diff --git a/usr/src/lib/libkmf/libkmf/Makefile.com b/usr/src/lib/libkmf/libkmf/Makefile.com
index 43de43cb1d..1ac577ab76 100644
--- a/usr/src/lib/libkmf/libkmf/Makefile.com
+++ b/usr/src/lib/libkmf/libkmf/Makefile.com
@@ -72,6 +72,9 @@ CERRWARN	+=	-_gcc=-Wno-switch
 CERRWARN	+=	-_gcc=-Wno-type-limits
 CERRWARN	+=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all:    $(LIBS)
diff --git a/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com
index 3b5f23aa92..79eb757e56 100644
--- a/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com
+++ b/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com
@@ -22,8 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# Makefile for KMF Plugins
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	kmf_nss.a
 VERS=		.1
@@ -46,7 +45,7 @@ NSSLIBS64=	$(BERLIB64) -L$(ADJUNCT_PROTO)$(MPSDIR)/$(MACH64) \
 SRCDIR=		../common
 INCDIR=		../../include
 
-CFLAGS		+=	$(CCVERBOSE) 
+CFLAGS		+=	$(CCVERBOSE)
 CPPFLAGS	+=	-D_REENTRANT $(KMFINC) $(NSSINC)  \
 		-I$(INCDIR) -I$(ADJUNCT_PROTO)/usr/include/libxml2
 
@@ -59,6 +58,9 @@ CERRWARN	+=	-_gcc=-Wno-unused-label
 CERRWARN	+=	-_gcc=-Wno-unused-value
 CERRWARN	+=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 lint:=	NSSLIBS =	$(BERLIB)
 lint:=	NSSLIBS64 =	$(BERLIB64)
 
diff --git a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com
index 5c327cae00..cbc1a780a4 100644
--- a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com
+++ b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com
@@ -21,8 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# Makefile for KMF Plugins
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	kmf_openssl.a
 VERS=		.1
@@ -51,7 +50,7 @@ LINTFLAGS64	+=	-erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
 SRCDIR=		../common
 INCDIR=		../../include
 
-CFLAGS		+=	$(CCVERBOSE) 
+CFLAGS		+=	$(CCVERBOSE)
 CPPFLAGS	+=	-D_REENTRANT $(KMFINC) \
 			-I$(INCDIR) -I$(ADJUNCT_PROTO)/usr/include/libxml2
 
@@ -59,6 +58,9 @@ CERRWARN	+=	-_gcc=-Wno-unused-label
 CERRWARN	+=	-_gcc=-Wno-unused-value
 CERRWARN	+=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 PICS=	$(OBJECTS:%=pics/%)
 
 lint:=	OPENSSLLIBS=	$(LINTSSLLIBS)
diff --git a/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com
index 0b69e23fd6..d8bdbec7f7 100644
--- a/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com
+++ b/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com
@@ -21,8 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# Makefile for KMF Plugins
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	kmf_pkcs11.a
 VERS=		.1
@@ -55,6 +54,9 @@ LINTFLAGS64	+=	-errchk=longptr64
 
 CERRWARN	+=	-_gcc=-Wno-unused-label
 
+# not linted
+SMATCH=off
+
 PICS=	$(OBJECTS:%=pics/%)
 
 LDLIBS	+=	$(PKCS11LIBS)
diff --git a/usr/src/lib/libkvm/Makefile.com b/usr/src/lib/libkvm/Makefile.com
index 9bef6968ba..41e4c80071 100644
--- a/usr/src/lib/libkvm/Makefile.com
+++ b/usr/src/lib/libkvm/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libkvm.a
 VERS=		.1
@@ -48,6 +49,8 @@ CPPFLAGS = -D_KMEMUSER -D_LARGEFILE64_SOURCE=1 -I.. $(CPPFLAGS.master)
 
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+SMOFF += signed
+
 CLOBBERFILES += test test.o
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libldap5/Makefile.com b/usr/src/lib/libldap5/Makefile.com
index ee48739eea..e0cb907335 100644
--- a/usr/src/lib/libldap5/Makefile.com
+++ b/usr/src/lib/libldap5/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= libldap.a
 VERS= .5
@@ -120,6 +121,9 @@ CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-unused-value
 CERRWARN +=	-_gcc=-Wno-address
 
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lsasl -lsocket -lnsl -lmd -lc
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libmapid/Makefile.com b/usr/src/lib/libmapid/Makefile.com
index 2b1eaac8a5..2d7c9e55ca 100644
--- a/usr/src/lib/libmapid/Makefile.com
+++ b/usr/src/lib/libmapid/Makefile.com
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libmapid.a
 VERS	=	.1
@@ -58,6 +58,8 @@ CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+SMOFF += all_func_returns
+
 .KEEP_STATE:
 
 all:  $(LIBS)
diff --git a/usr/src/lib/libmd/Makefile.com b/usr/src/lib/libmd/Makefile.com
index 9d2458f918..0fad27dcc7 100644
--- a/usr/src/lib/libmd/Makefile.com
+++ b/usr/src/lib/libmd/Makefile.com
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2013 Saso Kiselkov. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 LIBS =		$(DYNLIB) $(LINTLIB)
@@ -42,4 +43,6 @@ CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(SRCDIR)
 LDLIBS +=	-lc
 
+SMOFF += 64bit_shift
+
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
diff --git a/usr/src/lib/libnisdb/Makefile b/usr/src/lib/libnisdb/Makefile
index 7af72f8452..762f725643 100644
--- a/usr/src/lib/libnisdb/Makefile
+++ b/usr/src/lib/libnisdb/Makefile
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= libnisdb.a
 VERS=	.2
@@ -165,6 +165,9 @@ $(UVAR_PICS) := CERRWARN += -_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-switch
 
+# not linted
+SMATCH=off
+
 # Extra includes, from yp, for yptol files.
 CPPFLAGS += -I$(SRC)/cmd/ypcmd
 
diff --git a/usr/src/lib/libnsl/Makefile.com b/usr/src/lib/libnsl/Makefile.com
index 17bff31ba6..5260a7bc81 100644
--- a/usr/src/lib/libnsl/Makefile.com
+++ b/usr/src/lib/libnsl/Makefile.com
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2018 Nexenta Systems, Inc. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 LIBRARY= libnsl.a
@@ -203,6 +204,9 @@ CERRWARN +=	-_gcc=-Wno-empty-body
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-clobbered
 
+# not linted
+SMATCH=off
+
 LIBMP =		-lmp
 lint :=		LIBMP =
 LDLIBS +=	$(LIBMP) -lmd -lc
diff --git a/usr/src/lib/libnwam/Makefile.com b/usr/src/lib/libnwam/Makefile.com
index bce8452d4b..db26d0d23f 100644
--- a/usr/src/lib/libnwam/Makefile.com
+++ b/usr/src/lib/libnwam/Makefile.com
@@ -23,6 +23,7 @@
 # Use is subject to license terms.
 # Copyright (c) 2016, Chris Fraire <cfraire@me.com>.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libnwam.a
 VERS=		.1
@@ -56,6 +57,9 @@ CPPFLAGS +=	-I$(SRCDIR) -D_REENTRANT
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all:	$(LIBS)
diff --git a/usr/src/lib/libofmt/Makefile.com b/usr/src/lib/libofmt/Makefile.com
index 15cc384511..04a627f9e0 100644
--- a/usr/src/lib/libofmt/Makefile.com
+++ b/usr/src/lib/libofmt/Makefile.com
@@ -11,6 +11,7 @@
 
 #
 # Copyright 2017 Nexenta Systems, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 LIBRARY=	libofmt.a
@@ -29,6 +30,8 @@ SRCS=		$(SRCDIR)/ofmt.c
 $(LINTLIB)	:= SRCS = $(SRCDIR)/$(LINTSRC)
 LDLIBS +=	-lc
 
+SMOFF += kmalloc_wrong_size
+
 .KEEP_STATE:
 
 all:		$(LIBS)
diff --git a/usr/src/lib/libpicltree/Makefile.com b/usr/src/lib/libpicltree/Makefile.com
index e444c69527..1707ecebc6 100644
--- a/usr/src/lib/libpicltree/Makefile.com
+++ b/usr/src/lib/libpicltree/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libpicltree.a
 VERS=		.1
@@ -38,6 +39,9 @@ CFLAGS +=	$(CCVERBOSE)
 
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all : $(LIBS)
diff --git a/usr/src/lib/libpkg/Makefile.com b/usr/src/lib/libpkg/Makefile.com
index a0dd3bcab5..e3f93d3959 100644
--- a/usr/src/lib/libpkg/Makefile.com
+++ b/usr/src/lib/libpkg/Makefile.com
@@ -26,6 +26,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= libpkg.a
 VERS=	.1
@@ -67,6 +68,10 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-clobbered
 CERRWARN +=	-_gcc=-Wno-switch
+
+# not linted
+SMATCH=off
+
 CPPFLAGS +=	-I$(SRCDIR) -D_FILE_OFFSET_BITS=64
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libpool/Makefile.com b/usr/src/lib/libpool/Makefile.com
index 13b8a05cc1..d1c3972cae 100644
--- a/usr/src/lib/libpool/Makefile.com
+++ b/usr/src/lib/libpool/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libpool.a
 VERS =		.1
@@ -55,6 +56,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libproc/Makefile.com b/usr/src/lib/libproc/Makefile.com
index bf20ef40d5..bb72f8dc17 100644
--- a/usr/src/lib/libproc/Makefile.com
+++ b/usr/src/lib/libproc/Makefile.com
@@ -23,6 +23,7 @@
 # Copyright 2012 DEY Storage Systems, Inc.  All rights reserved.
 # Copyright (c) 2013 by Delphix. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY = libproc.a
 VERS = .1
@@ -99,6 +100,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-type-limits
 CERRWARN +=	-_gcc=-Wno-unused-label
 
+# not linted
+SMATCH=off
+
 # All interfaces are interposable, therefore don't allow direct binding to
 # libproc.  Disable libproc from directly binding to itself, but allow libperl
 # to directly bind to its dependencies (ie. map -Bdirect -> -zdirect).  Ensure
diff --git a/usr/src/lib/libraidcfg/Makefile.com b/usr/src/lib/libraidcfg/Makefile.com
index 1aeed69bfd..b3643c2d6b 100644
--- a/usr/src/lib/libraidcfg/Makefile.com
+++ b/usr/src/lib/libraidcfg/Makefile.com
@@ -23,8 +23,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# lib/libraidcfg/Makefile.com
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libraidcfg.a
 VERS =		.1
@@ -41,6 +40,9 @@ $(LINTLIB):=	SRCS = $(LINTSRC:%=$(SRCDIR)/%)
 CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-type-limits
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libresolv/Makefile b/usr/src/lib/libresolv/Makefile
index 4b905e0c8f..fe94b16c25 100644
--- a/usr/src/lib/libresolv/Makefile
+++ b/usr/src/lib/libresolv/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= libresolv.a
 VERS= .1
@@ -60,6 +61,9 @@ CFLAGS += $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 ROOTDYNLIBS=	$(DYNLIB:%=$(ROOTLIBDIR)/%)
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libresolv2/Makefile.com b/usr/src/lib/libresolv2/Makefile.com
index 942d2a69b8..35e1eca77c 100644
--- a/usr/src/lib/libresolv2/Makefile.com
+++ b/usr/src/lib/libresolv2/Makefile.com
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= libresolv.a
 VERS= .2
@@ -32,16 +32,16 @@ BSDOBJS=   	putenv.o	strcasecmp.o	strsep.o \
 		gettimeofday.o	setenv.o	strerror.o	utimes.o \
 		mktemp.o	setitimer.o	strpbrk.o	writev.o
 
-DSTOBJS=	dst_api.o	support.o	hmac_link.o 
+DSTOBJS=	dst_api.o	support.o	hmac_link.o
 
-# inet_addr, inet_pton, inet_ntop, and inet_ntoa removed due to overlap with 
+# inet_addr, inet_pton, inet_ntop, and inet_ntoa removed due to overlap with
 # libnsl
 INETOBJS= 	inet_net_pton.o	inet_neta.o	inet_lnaof.o \
 		inet_netof.o 	nsap_addr.o	inet_makeaddr.o	\
 		inet_network.o	inet_net_ntop.o	inet_cidr_ntop.o \
 		inet_cidr_pton.o 		inet_data.o
 
-# build only the IRS objects that the ISC libbind's make would 
+# build only the IRS objects that the ISC libbind's make would
 IRSTHROBJS=	gethostent_r.o	getnetent_r.o 	getnetgrent_r.o \
 		getprotoent_r.o	getservent_r.o
 IRSOBJS=	${IRSTHROBJS} \
@@ -108,10 +108,13 @@ LOCFLAGS +=	$(CRYPTFLAGS)
 LOCFLAGS +=	-D_SYS_STREAM_H -D_REENTRANT -DSVR4 -DSUNW_OPTIONS \
 		$(SOLCOMPAT) -I../include -I../../common/inc
 
-CPPFLAGS +=	$(LOCFLAGS) 
+CPPFLAGS +=	$(LOCFLAGS)
 
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 
+# not linted
+SMATCH=off
+
 DYNFLAGS +=	$(ZNODELETE)
 
 LDLIBS +=	-lsocket -lnsl -lc -lmd
diff --git a/usr/src/lib/librestart/Makefile.com b/usr/src/lib/librestart/Makefile.com
index 7f2ef884aa..f2a0fc8965 100644
--- a/usr/src/lib/librestart/Makefile.com
+++ b/usr/src/lib/librestart/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	librestart.a
 VERS =		.1
@@ -42,6 +43,9 @@ CFLAGS +=	$(CCVERBOSE) -Wp,$(CSTD_GNU99)
 
 CPPFLAGS +=
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all:
diff --git a/usr/src/lib/librsm/Makefile.com b/usr/src/lib/librsm/Makefile.com
index 5323366ddd..1b4f118a20 100644
--- a/usr/src/lib/librsm/Makefile.com
+++ b/usr/src/lib/librsm/Makefile.com
@@ -22,13 +22,14 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= librsm.a
 VERS= .2
 
 TEXT_DOMAIN=	SUNW_OST_OSLIB
 
-OBJECTS = rsmlib.o rsmgen.o rsmloopback.o 
+OBJECTS = rsmlib.o rsmgen.o rsmloopback.o
 
 # include library definitions, do not change order of include and DYNLIB
 include ../../Makefile.lib
@@ -41,7 +42,7 @@ LIBS = $(DYNLIB)
 DEBUG =
 $(NOT_RELEASE_BUILD)DEBUG = -DDEBUG
 
-# The COPTFLAG is used for optimization purposes. 
+# The COPTFLAG is used for optimization purposes.
 # It is disabled for debug builds
 $(NOT_RELEASE_BUILD)COPTFLAG =
 $(NOT_RELEASE_BUILD)COPTFLAG64 =
@@ -51,6 +52,9 @@ CPPFLAGS = -I../inc -I../../common/inc $(CPPFLAGS.master) -D_REENTRANT $(DEBUG)
 CERRWARN	+= -_gcc=-Wno-unused-variable
 CERRWARN	+= -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 LDLIBS += -lc
 
 .KEEP_STATE:
diff --git a/usr/src/lib/librstp/Makefile.com b/usr/src/lib/librstp/Makefile.com
index de23f29906..82beb3a2a1 100644
--- a/usr/src/lib/librstp/Makefile.com
+++ b/usr/src/lib/librstp/Makefile.com
@@ -23,6 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	librstp.a
 VERS =		.1
@@ -44,6 +45,9 @@ LDLIBS +=	-lc
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(SRCDIR) -D__SUN__ -D__STP_INTERNAL__
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libsasl/Makefile.com b/usr/src/lib/libsasl/Makefile.com
index 0403f1fa15..6b6aa0e69f 100644
--- a/usr/src/lib/libsasl/Makefile.com
+++ b/usr/src/lib/libsasl/Makefile.com
@@ -22,8 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= libsasl.a
 VERS= .1
@@ -52,6 +51,9 @@ CFLAGS +=	$(CCVERBOSE) $(XSTRCONST)
 CFLAGS64 +=	$(XSTRCONST)
 CPPFLAGS +=	-I../include -I$(PLUGDIR)
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libsaveargs/Makefile.com b/usr/src/lib/libsaveargs/Makefile.com
index 6db07cb87c..94d80c1d5b 100644
--- a/usr/src/lib/libsaveargs/Makefile.com
+++ b/usr/src/lib/libsaveargs/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 #
 # The build process for libsaveargs is sightly different from that used by other
@@ -94,6 +95,9 @@ CFLAGS += $(CFLAGS_$(CURTYPE)) $(CFLAGS_common)
 CFLAGS64_standalone = $(STAND_FLAGS_64)
 CFLAGS64 += $(CCVERBOSE) $(CFLAGS64_$(CURTYPE)) $(CFLAGS64_common)
 
+# not linted
+SMATCH=off
+
 DYNFLAGS +=     $(ZINTERPOSE)
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libscf/Makefile.com b/usr/src/lib/libscf/Makefile.com
index a6e2657925..071818bef9 100644
--- a/usr/src/lib/libscf/Makefile.com
+++ b/usr/src/lib/libscf/Makefile.com
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libscf.a
 VERS =		.1
@@ -62,6 +63,9 @@ CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 #
 # For native builds, we compile and link against the native version
 # of libuutil.
diff --git a/usr/src/lib/libsec/Makefile.com b/usr/src/lib/libsec/Makefile.com
index 6a30ddf56a..58834e08f1 100644
--- a/usr/src/lib/libsec/Makefile.com
+++ b/usr/src/lib/libsec/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= libsec.a
 VERS= .1
@@ -51,6 +52,9 @@ CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-unused-variable
 
+# not linted
+SMATCH=off
+
 CLOBBERFILES += acl.output
 
 # install this library in the root filesystem
diff --git a/usr/src/lib/libshare/Makefile.com b/usr/src/lib/libshare/Makefile.com
index 509ba0c662..3628432a6a 100644
--- a/usr/src/lib/libshare/Makefile.com
+++ b/usr/src/lib/libshare/Makefile.com
@@ -20,6 +20,7 @@
 #
 # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2016 by Delphix. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 LIBRARY =	libshare.a
 VERS =		.1
@@ -47,6 +48,10 @@ CSTD +=	$(CSTD_GNU99)
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-switch
+
+# not linted
+SMATCH=off
+
 CPPFLAGS +=	-D_REENTRANT -I$(NFSLIB_DIR) \
 		-I$(ADJUNCT_PROTO)/usr/include/libxml2
 
diff --git a/usr/src/lib/libshare/autofs/Makefile.com b/usr/src/lib/libshare/autofs/Makefile.com
index d110bf634a..0123923ddb 100644
--- a/usr/src/lib/libshare/autofs/Makefile.com
+++ b/usr/src/lib/libshare/autofs/Makefile.com
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libshare_autofs.a
 VERS =		.1
@@ -49,6 +49,10 @@ CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
+
+# not linted
+SMATCH=off
+
 CPPFLAGS +=	-D_REENTRANT -I$(AUTOFSSMFLIB_DIR) \
 			-I$(ADJUNCT_PROTO)/usr/include/libxml2 \
   			-I$(SRCDIR)../common
@@ -67,7 +71,7 @@ pics/%.o:       $(AUTOFSSMFLIB_DIR)/%.c
 
 $(ROOTLIBDIR):
 	$(INS.dir)
- 
+
 $(ROOTLIBDIR64):
 	$(INS.dir)
 
diff --git a/usr/src/lib/libshare/nfs/Makefile.com b/usr/src/lib/libshare/nfs/Makefile.com
index ed89b6d960..f6675414cf 100644
--- a/usr/src/lib/libshare/nfs/Makefile.com
+++ b/usr/src/lib/libshare/nfs/Makefile.com
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libshare_nfs.a
 VERS =		.1
@@ -53,6 +54,9 @@ CERRWARN +=	-_gcc=-Wno-uninitialized
 CPPFLAGS +=	-D_REENTRANT -I$(NFSLIB_DIR) \
 		-I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(SRCDIR)/../common
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libshare/smb/Makefile.com b/usr/src/lib/libshare/smb/Makefile.com
index ea69f59b22..386ffc35de 100644
--- a/usr/src/lib/libshare/smb/Makefile.com
+++ b/usr/src/lib/libshare/smb/Makefile.com
@@ -24,6 +24,7 @@
 #
 # Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libshare_smb.a
 VERS =		.1
@@ -50,6 +51,10 @@ LDLIBS +=	-lshare -lscf -luuid -ldlpi -lnsl -lnvpair -lxml2 -lumem -lc
 CFLAGS +=	$(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-char-subscripts
 CERRWARN +=	-_gcc=-Wno-switch
+
+# not linted
+SMATCH=off
+
 CPPFLAGS +=	-D_REENTRANT -I$(ADJUNCT_PROTO)/usr/include/libxml2 \
   		-I$(SRCDIR)/../common
 $(ENABLE_SMB_PRINTING) CPPFLAGS += -DHAVE_CUPS
diff --git a/usr/src/lib/libsip/Makefile.com b/usr/src/lib/libsip/Makefile.com
index febd458320..b73783361d 100644
--- a/usr/src/lib/libsip/Makefile.com
+++ b/usr/src/lib/libsip/Makefile.com
@@ -21,8 +21,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY = libsip.a
 VERS    = .1
@@ -43,6 +42,9 @@ LDLIBS +=	-lmd5 -lc
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-DOS='"solaris"' -D__OS_solaris -DNDEBUG
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all:		$(LIBS)
diff --git a/usr/src/lib/libsldap/Makefile.com b/usr/src/lib/libsldap/Makefile.com
index 0d35b1f794..4854275b4b 100644
--- a/usr/src/lib/libsldap/Makefile.com
+++ b/usr/src/lib/libsldap/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= libsldap.a
 VERS= .1
@@ -55,6 +56,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libslp/Makefile.com b/usr/src/lib/libslp/Makefile.com
index 80c1cc01e4..0e8f4f70c0 100644
--- a/usr/src/lib/libslp/Makefile.com
+++ b/usr/src/lib/libslp/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libslp.a
 VERS =		.1
@@ -48,6 +49,9 @@ CPPFLAGS +=	-D_REENTRANT -I../clib -I$(JAVA_ROOT)/include \
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all:
diff --git a/usr/src/lib/libsmbfs/Makefile.com b/usr/src/lib/libsmbfs/Makefile.com
index 8f8b118128..872e8222a5 100644
--- a/usr/src/lib/libsmbfs/Makefile.com
+++ b/usr/src/lib/libsmbfs/Makefile.com
@@ -26,6 +26,7 @@
 #
 # Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 #
 # lib/libsmbfs/Makefile.com
@@ -76,7 +77,7 @@ OBJ_LIB=\
 	ui-sun.o \
 	utf_str.o
 
-OBJ_CMN= smbfs_ntacl.o 
+OBJ_CMN= smbfs_ntacl.o
 
 OBJECTS= $(OBJ_LIB) $(OBJ_CMN)
 
@@ -97,11 +98,14 @@ CSTD=	$(CSTD_GNU99)
 LDLIBS += -lsocket -lnsl -lc -lmd -lpkcs11 -lkrb5 -lsec -lidmap
 
 # normal warnings...
-CFLAGS	+=	$(CCVERBOSE) 
+CFLAGS	+=	$(CCVERBOSE)
 
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-variable
 
+# not linted
+SMATCH=off
+
 CPPFLAGS += -D__EXTENSIONS__ -D_REENTRANT -DMIA \
 	-I$(SRCDIR) -I.. -I../netsmb \
 	-I$(SRC)/uts/common \
diff --git a/usr/src/lib/libsmedia/plugins/Makefile.com b/usr/src/lib/libsmedia/plugins/Makefile.com
index f1fa1c19e2..5c239ce171 100644
--- a/usr/src/lib/libsmedia/plugins/Makefile.com
+++ b/usr/src/lib/libsmedia/plugins/Makefile.com
@@ -22,8 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBS =		$(DYNLIB)
 
@@ -43,6 +42,9 @@ CLEANFILES=	$(LINTOUT) $(LINTPLUGIN)
 
 SRCDIR =	../common
 
+# not linted
+SMATCH=off
+
 LINTFLAGS += -xu
 LINTFLAGS64 += -xu
 $(LINTPLUGIN) :=	SRCS=$(OBJECTS:%.o=../common/%.c)
diff --git a/usr/src/lib/libsocket/Makefile.com b/usr/src/lib/libsocket/Makefile.com
index ed741f39d8..f4b4ac28e6 100644
--- a/usr/src/lib/libsocket/Makefile.com
+++ b/usr/src/lib/libsocket/Makefile.com
@@ -21,6 +21,7 @@
 
 #
 # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 LIBRARY	=	libsocket.a
@@ -60,6 +61,9 @@ CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all:
diff --git a/usr/src/lib/libsqlite/Makefile.com b/usr/src/lib/libsqlite/Makefile.com
index f2671beccc..3ce5d9b1e4 100644
--- a/usr/src/lib/libsqlite/Makefile.com
+++ b/usr/src/lib/libsqlite/Makefile.com
@@ -3,6 +3,7 @@
 # Use is subject to license terms.
 # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 # Copyright 2016 Nexenta Systems, Inc.  All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 # Make the SO name unlikely to conflict with any other
@@ -99,6 +100,9 @@ CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-unused-function
 CERRWARN += -_gcc=-Wno-unused-label
 
+# not linted
+SMATCH=off
+
 MAPFILES = ../mapfile-sqlite
 
 # headers generated here
diff --git a/usr/src/lib/libstmf/Makefile.com b/usr/src/lib/libstmf/Makefile.com
index 76ffd111de..7fd4d6b09d 100644
--- a/usr/src/lib/libstmf/Makefile.com
+++ b/usr/src/lib/libstmf/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= libstmf.a
 VERS= .1
@@ -43,6 +44,9 @@ CPPFLAGS +=	$(INCS) -D_REENTRANT
 
 CERRWARN +=	-_gcc=-Wno-unused-label
 
+# not linted
+SMATCH=off
+
 $(LINTLIB) := SRCS=	$(SRCDIR)/$(LINTSRC)
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libsum/Makefile.com b/usr/src/lib/libsum/Makefile.com
index 5fdf850a78..9dffd007f4 100644
--- a/usr/src/lib/libsum/Makefile.com
+++ b/usr/src/lib/libsum/Makefile.com
@@ -23,6 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 SHELL=/usr/bin/ksh93
 
@@ -76,6 +77,8 @@ CFLAGS64 += \
 
 CERRWARN	+= -_gcc=-Wno-parentheses
 
+SMOFF += all_func_returns
+
 # This codepath is performance-critical
 sparc_COPTFLAG=-xO5 -_cc=-xprefetch=auto,explicit
 sparcv9_COPTFLAG=-xO5 -_cc=-xprefetch=auto,explicit
diff --git a/usr/src/lib/libsun_ima/Makefile.com b/usr/src/lib/libsun_ima/Makefile.com
index 321b966a83..f23c75c7b0 100644
--- a/usr/src/lib/libsun_ima/Makefile.com
+++ b/usr/src/lib/libsun_ima/Makefile.com
@@ -22,7 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libsun_ima.a
 VERS =		.1
@@ -51,6 +51,9 @@ CFLAGS64 +=	$(CCVERBOSE)
 
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 CPPFLAGS +=	-DSOLARIS
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libsysevent/Makefile.com b/usr/src/lib/libsysevent/Makefile.com
index dcb6517a0d..a1f97796c2 100644
--- a/usr/src/lib/libsysevent/Makefile.com
+++ b/usr/src/lib/libsysevent/Makefile.com
@@ -22,8 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libsysevent.a
 
@@ -44,6 +43,9 @@ CPPFLAGS +=	-D_REENTRANT -I..
 CFLAGS +=	$(CCVERBOSE)
 LDLIBS +=	-lnvpair -lc
 
+# not linted
+SMATCH=off
+
 $(LINTLIB) :=	SRCS = ../llib-lsysevent
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libtecla/Makefile.com b/usr/src/lib/libtecla/Makefile.com
index 1f52c6b878..975e67c4a0 100644
--- a/usr/src/lib/libtecla/Makefile.com
+++ b/usr/src/lib/libtecla/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libtecla.a
 VERS=		.1
@@ -46,6 +47,9 @@ $(LINTLIB) := SRCS=	$(SRCDIR)/$(LINTSRC)
 
 CERRWARN +=	-_gcc=-Wno-type-limits
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all:	$(LIBS)
diff --git a/usr/src/lib/libtnfctl/Makefile.com b/usr/src/lib/libtnfctl/Makefile.com
index 4117e0fa8a..e3e14c3304 100644
--- a/usr/src/lib/libtnfctl/Makefile.com
+++ b/usr/src/lib/libtnfctl/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libtnfctl.a
 VERS=		.1
@@ -80,6 +81,9 @@ CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-empty-body
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 ASFLAGS +=	-P
 
 $(ROOTHDRS) :=	FILEMODE = 644
diff --git a/usr/src/lib/libtnfprobe/Makefile.com b/usr/src/lib/libtnfprobe/Makefile.com
index f0fe5a2658..f4df1679f3 100644
--- a/usr/src/lib/libtnfprobe/Makefile.com
+++ b/usr/src/lib/libtnfprobe/Makefile.com
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libtnfprobe.a
 VERS=		.1
@@ -66,6 +67,9 @@ CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 $(ROOTHDRS) :=	FILEMODE = 644
 
 LDLIBS += -lc
diff --git a/usr/src/lib/libtsol/Makefile.com b/usr/src/lib/libtsol/Makefile.com
index f58f6f63ec..5028745796 100644
--- a/usr/src/lib/libtsol/Makefile.com
+++ b/usr/src/lib/libtsol/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libtsol.a
 VERS =		.2
@@ -61,6 +62,9 @@ LINTFLAGS64 +=	-m64
 
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libumem/Makefile.com b/usr/src/lib/libumem/Makefile.com
index 61f7e9503d..b98977ed88 100644
--- a/usr/src/lib/libumem/Makefile.com
+++ b/usr/src/lib/libumem/Makefile.com
@@ -22,7 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# Copyright (c) 2012, Joyent, Inc.  All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 #
@@ -130,6 +130,8 @@ ASFLAGS += -P $(ASFLAGS_$(CURTYPE)) -D_ASM
 CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-uninitialized
 
+SMOFF += deref_check
+
 $(LINTLIB) := SRCS = ../common/$(LINTSRC)
 
 # We want the thread-specific errno in the library, but we don't want it in
diff --git a/usr/src/lib/libuutil/Makefile.com b/usr/src/lib/libuutil/Makefile.com
index 73b1dcddb9..d9da48cc0c 100644
--- a/usr/src/lib/libuutil/Makefile.com
+++ b/usr/src/lib/libuutil/Makefile.com
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libuutil.a
 VERS =		.1
@@ -73,6 +74,8 @@ CPPFLAGS +=	-I$(SRCDIR) -I../../common/inc
 LINTFLAGS +=	-erroff=E_GLOBAL_COULD_BE_STATIC2
 LINTFLAGS64 +=	-erroff=E_GLOBAL_COULD_BE_STATIC2
 
+SMOFF += signed
+
 MY_NATIVE_CPPFLAGS = -DNATIVE_BUILD -I$(SRCDIR)
 MY_NATIVE_LDLIBS = -lc
 
diff --git a/usr/src/lib/libvscan/Makefile.com b/usr/src/lib/libvscan/Makefile.com
index 1f43359369..5ec00cc3d3 100644
--- a/usr/src/lib/libvscan/Makefile.com
+++ b/usr/src/lib/libvscan/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= libvscan.a
 VERS= .1
@@ -41,6 +42,8 @@ LDLIBS += -lc -lscf -lsecdb -lm
 CFLAGS += $(CCVERBOSE)
 CPPFLAGS += -I$(SRCDIR)
 
+SMOFF += signed
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libwrap/Makefile.com b/usr/src/lib/libwrap/Makefile.com
index f3ce93d1e5..40e2f11d0a 100644
--- a/usr/src/lib/libwrap/Makefile.com
+++ b/usr/src/lib/libwrap/Makefile.com
@@ -22,6 +22,7 @@
 # Use is subject to license terms.
 #
 # Copyright 2011 Nexenta Systems, Inc. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 LIBRARY =	libwrap.a
@@ -48,7 +49,7 @@ LDLIBS +=	-lsocket -lnsl -lc
 CPPFLAGS +=	$(NETGROUP) $(TLI) $(ALWAYS_HOSTNAME) $(AUTH) \
 		$(STYLE) $(TABLES) $(DOT) $(BUGS) \
 		-DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \
-		-I$(SRCDIR) 
+		-I$(SRCDIR)
 CFLAGS +=	$(CCVERBOSE)
 
 CERRWARN +=	-erroff=E_FUNC_EXPECTS_TO_RETURN_VALUE
@@ -60,6 +61,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
@@ -98,7 +102,7 @@ NETGROUP	= -DNETGROUP
 # module, which also gives hints on how to add your own extensions.
 # Uncomment the next definition to turn on the language extensions
 # (examples: allow, deny, banners, twist and spawn).
-# 
+#
 STYLE	= -DPROCESS_OPTIONS	# Enable language extensions.
 
 ###########################
@@ -126,7 +130,7 @@ STYLE	= -DPROCESS_OPTIONS	# Enable language extensions.
 # with connections from non-UNIX PCs.  On some systems, remote username
 # lookups can trigger a kernel bug, causing loss of service. The README
 # file describes how to find out if your UNIX kernel has that problem.
-# 
+#
 # Uncomment the following definition if the wrappers should always
 # attempt to get the remote user name. If this is not enabled you can
 # still do selective username lookups as documented in the hosts_access.5
@@ -155,7 +159,7 @@ TABLES	= -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\"
 # hostname.  With selective hostname lookups, the client hostname
 # lookup is postponed until the name is required by an access control
 # rule or by a %letter expansion.
-# 
+#
 # In order to perform selective hostname lookups, disable paranoid
 # mode (see previous section) and comment out the following definition.
 
diff --git a/usr/src/lib/libxcurses/Makefile.com b/usr/src/lib/libxcurses/Makefile.com
index 15658cc686..1449690433 100644
--- a/usr/src/lib/libxcurses/Makefile.com
+++ b/usr/src/lib/libxcurses/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libcurses.a
 VERS=	.1
@@ -111,13 +112,16 @@ ROOTLIBDIR64=	$(ROOT)/usr/xpg4/lib/$(MACH64)
 ROOTLIBS=	$(LIBS:%=$(ROOTLIBDIR)/%)
 
 $(LINTLIB):= SRCS=../src/libc/llib-lcurses
-$(LINTLIB):= CPPFLAGS += -D_XOPEN_SOURCE_EXTENDED 
+$(LINTLIB):= CPPFLAGS += -D_XOPEN_SOURCE_EXTENDED
 
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 LINTSRC=	$(LINTLIB:%.ln=%)
 
 LDLIBS += -lc
diff --git a/usr/src/lib/libxcurses2/Makefile.com b/usr/src/lib/libxcurses2/Makefile.com
index c1629d2435..41235cf283 100644
--- a/usr/src/lib/libxcurses2/Makefile.com
+++ b/usr/src/lib/libxcurses2/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libcurses.a
 VERS=	.2
@@ -99,6 +100,9 @@ CPPFLAGS = -I../h -I../src/libc/xcurses $(CPPFLAGS.master)
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-unused-value
 
+# not linted
+SMATCH=off
+
 #
 # If and when somebody gets around to messaging this, CLOBBERFILE should not
 # be cleared (so that any .po file will be clobbered.
diff --git a/usr/src/lib/libzfs/Makefile.com b/usr/src/lib/libzfs/Makefile.com
index 581adf9120..996087bc0a 100644
--- a/usr/src/lib/libzfs/Makefile.com
+++ b/usr/src/lib/libzfs/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2016 Igor Kozhukhov <ikozhukhov@gmail.com>
 # Copyright (c) 2011, 2017 by Delphix. All rights reserved.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 LIBRARY= libzfs.a
@@ -75,6 +76,9 @@ LDLIBS +=	-lc -lm -ldevid -lgen -lnvpair -luutil -lavl -lefi \
 CPPFLAGS +=	$(INCS) -D_LARGEFILE64_SOURCE=1 -D_REENTRANT
 $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
 
+# not linted
+SMATCH=off
+
 # There's no lint library for zlib, so only include this when building
 $(DYNLIB) := LDLIBS +=	-lz
 
diff --git a/usr/src/lib/libzfs_jni/Makefile.com b/usr/src/lib/libzfs_jni/Makefile.com
index 8d8f9c4b26..693542d081 100644
--- a/usr/src/lib/libzfs_jni/Makefile.com
+++ b/usr/src/lib/libzfs_jni/Makefile.com
@@ -22,10 +22,10 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-
-#
 # Copyright (c) 2015 by Delphix. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
+#
 
 LIBRARY= libzfs_jni.a
 VERS= .1
@@ -50,6 +50,8 @@ CPPFLAGS +=	$(INCS)
 $(NOT_RELEASE_BUILD) CPPFLAGS += -DDEBUG
 CERRWARN +=	-_gcc=-Wno-switch
 
+SMOFF += all_func_returns
+
 SRCDIR =	../common
 $(LINTLIB) := SRCS=	$(SRCDIR)/$(LINTSRC)
 
diff --git a/usr/src/lib/libzonestat/Makefile.com b/usr/src/lib/libzonestat/Makefile.com
index be23af3d93..ca7b710a18 100644
--- a/usr/src/lib/libzonestat/Makefile.com
+++ b/usr/src/lib/libzonestat/Makefile.com
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libzonestat.a
 VERS=		.1
@@ -28,7 +29,7 @@ OBJECTS=	libzonestat.o
 
 include ../../Makefile.lib
 
-LIBS =		$(DYNLIB) $(LINTLIB) 
+LIBS =		$(DYNLIB) $(LINTLIB)
 LDLIBS +=	-lcmdutils -lumem -lc
 
 SRCDIR =	../common
@@ -37,6 +38,9 @@ $(LINTLIB) := SRCS=	$(SRCDIR)/$(LINTSRC)
 
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all:	$(LIBS)
diff --git a/usr/src/lib/libzpool/Makefile.com b/usr/src/lib/libzpool/Makefile.com
index 1faef17cd7..51475a4051 100644
--- a/usr/src/lib/libzpool/Makefile.com
+++ b/usr/src/lib/libzpool/Makefile.com
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2013, 2016 by Delphix. All rights reserved.
-# Copyright 2018 Joyent, Inc.
+# Copyright (c) 2018, Joyent, Inc.
 #
 
 LIBRARY= libzpool.a
@@ -89,6 +89,9 @@ CERRWARN +=	-_gcc=-Wno-empty-body
 CERRWARN +=	-_gcc=-Wno-unused-function
 CERRWARN +=	-_gcc=-Wno-unused-label
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/mpapi/libmpapi/Makefile.com b/usr/src/lib/mpapi/libmpapi/Makefile.com
index 892120bbf9..d62912f592 100644
--- a/usr/src/lib/mpapi/libmpapi/Makefile.com
+++ b/usr/src/lib/mpapi/libmpapi/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libMPAPI.a
 VERS=		.1
@@ -47,6 +48,9 @@ CERRWARN +=	-_gcc=-Wno-type-limits
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 ROOTETC =	$(ROOT)/etc
 CONFDIR =	../common
 CONFFILE =	$(CONFDIR)/mpapi.conf
diff --git a/usr/src/lib/mpapi/libmpscsi_vhci/Makefile.com b/usr/src/lib/mpapi/libmpscsi_vhci/Makefile.com
index 4a357345fa..023d711284 100644
--- a/usr/src/lib/mpapi/libmpscsi_vhci/Makefile.com
+++ b/usr/src/lib/mpapi/libmpscsi_vhci/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libmpscsi_vhci.a
 VERS=		.1
@@ -65,6 +66,9 @@ CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(SRCDIR) -D_POSIX_PTHREAD_SEMANTICS
 CPPFLAGS +=	-DBUILD_TIME='"Wed Sep 24 12:00:00 2008"'
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/nsswitch/Makefile.com b/usr/src/lib/nsswitch/Makefile.com
index 9cbd34291b..570ae3a035 100644
--- a/usr/src/lib/nsswitch/Makefile.com
+++ b/usr/src/lib/nsswitch/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 include		$(SRC)/lib/Makefile.lib
 
@@ -41,6 +42,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-address
 
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lc
 HSONAME =
 
diff --git a/usr/src/lib/pam_modules/authtok_check/Makefile.com b/usr/src/lib/pam_modules/authtok_check/Makefile.com
index 79332c6e90..ffdafad371 100644
--- a/usr/src/lib/pam_modules/authtok_check/Makefile.com
+++ b/usr/src/lib/pam_modules/authtok_check/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	pam_authtok_check.a
 VERS=		.1
@@ -35,6 +36,9 @@ LDLIBS		+= -lpam -lc
 CPPFLAGS	+= -D_FILE_OFFSET_BITS=64
 CERRWARN	+= -_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 all:	$(LIBS)
 
 lint:	lintcheck
diff --git a/usr/src/lib/pam_modules/krb5/Makefile.com b/usr/src/lib/pam_modules/krb5/Makefile.com
index 222f064fad..44e00890ad 100644
--- a/usr/src/lib/pam_modules/krb5/Makefile.com
+++ b/usr/src/lib/pam_modules/krb5/Makefile.com
@@ -22,8 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/krb5/Makefile.com
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	pam_krb5.a
 VERS=		.1
@@ -51,6 +50,9 @@ CPPFLAGS +=	-I../../../gss_mechs/mech_krb5/include \
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+# not linted
+SMATCH=off
+
 # module needs to be unloadable because the key destructor might be
 # called after dlclose()
 DYNFLAGS +=	$(ZNODELETE)
diff --git a/usr/src/lib/passwdutil/Makefile.com b/usr/src/lib/passwdutil/Makefile.com
index 0b7c1ec4c4..d62fa7963d 100644
--- a/usr/src/lib/passwdutil/Makefile.com
+++ b/usr/src/lib/passwdutil/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	passwdutil.a
 VERS=		.1
@@ -43,7 +44,7 @@ OBJECTS=	$(OBJ)
 include	../../Makefile.lib
 
 #
-# Since our name doesn't start with "lib", Makefile.lib incorrectly 
+# Since our name doesn't start with "lib", Makefile.lib incorrectly
 # calculates LIBNAME. Therefore, we set it here.
 #
 LIBNAME=	passwdutil
@@ -60,6 +61,9 @@ CERRWARN	+= -_gcc=-Wno-switch
 CERRWARN	+= -_gcc=-Wno-uninitialized
 CERRWARN	+= -_gcc=-Wno-unused-label
 
+# not linted
+SMATCH=off
+
 lint	:=	SRCS= $(OBJ:%.o=$(SRCDIR)/%.c)
 
 .KEEP_STATE:
diff --git a/usr/src/lib/pkcs11/libpkcs11/Makefile.com b/usr/src/lib/pkcs11/libpkcs11/Makefile.com
index 33283e66e1..7c8d79737a 100644
--- a/usr/src/lib/pkcs11/libpkcs11/Makefile.com
+++ b/usr/src/lib/pkcs11/libpkcs11/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= libpkcs11.a
 VERS= .1
@@ -78,6 +79,9 @@ LINTFLAGS64 += -errchk=longptr64
 CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all:	$(LIBS)
diff --git a/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile
index 40a2ae7830..1d184f528a 100644
--- a/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile
+++ b/usr/src/lib/pkcs11/libsoftcrypto/amd64/Makefile
@@ -24,6 +24,7 @@
 # Copyright 2017 Jason King
 # Copyright (c) 2018, Joyent, Inc.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libsoftcrypto.a
 VERS =		.1
@@ -42,6 +43,9 @@ CERRWARN +=	-_gcc=-Wno-type-limits
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 AES_PSM_SRC =	$(AES_DIR)/$(MACH64)/aes_amd64.s \
 		$(AES_DIR)/$(MACH64)/aes_intel.s \
 		$(AES_DIR)/$(MACH64)/aeskey.c
diff --git a/usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile b/usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile
index 897a2da6cd..4968174065 100644
--- a/usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile
+++ b/usr/src/lib/pkcs11/libsoftcrypto/i386/Makefile
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libsoftcrypto.a
 VERS =		.1
@@ -34,6 +35,9 @@ CERRWARN +=	-_gcc=-Wno-type-limits
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 # Sources need to be redefined after Makefile.lib inclusion.
 SRCS =		$(AES_SRC) $(ARCFOUR_SRC) $(BIGNUM_SRC) $(BLOWFISH_SRC) \
 		$(DES_SRC) $(MODES_SRC) $(DH_SRC) $(DSA_SRC) $(RSA_SRC) \
diff --git a/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com b/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com
index e44f6cfec0..d29e303e77 100644
--- a/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com
+++ b/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= pkcs11_kernel.a
 VERS= .1
@@ -88,6 +89,9 @@ CFLAGS  +=      $(CCVERBOSE)
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-label
 
+# not linted
+SMATCH=off
+
 ROOTLIBDIR=     $(ROOT)/usr/lib/security
 ROOTLIBDIR64=   $(ROOT)/usr/lib/security/$(MACH64)
 
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com b/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com
index 2f544d4434..c571c0b278 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com
+++ b/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.com
@@ -24,8 +24,7 @@
 # Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
 # Copyright 2018, Joyent, Inc.
 #
-# lib/pkcs11/pkcs11_softtoken/Makefile.com
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY = pkcs11_softtoken.a
 VERS= .1
@@ -136,6 +135,9 @@ CERRWARN +=	-_gcc=-Wno-type-limits
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-empty-body
 
+# not linted
+SMATCH=off
+
 CPPFLAGS += -I$(AESDIR) -I$(BLOWFISHDIR) -I$(ARCFOURDIR) -I$(DESDIR) \
 	    -I$(DHDIR) -I$(DSADIR) -I$(ECCDIR) -I$(SRC)/common/crypto \
 	    -I$(MPIDIR) -I$(RSADIR) -I$(RNGDIR) \
diff --git a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
index 76b2f3f302..d09d2012f0 100644
--- a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
+++ b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
@@ -23,6 +23,8 @@
 #
 # Copyright 2018 Jason King
 #
+# Copyright (c) 2018, Joyent, Inc.
+
 LIBRARY =	pkcs11_tpm.a
 VERS =		.1
 
@@ -95,6 +97,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-unused-label
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LINTSRC= $(OBJECTS:%.o=$(SRCDIR)/%.c)
 
 $(LINTLIB):=	SRCS	=	$(SRCDIR)/$(LINTSRC)
@@ -105,7 +110,7 @@ CLOBBERFILES += C.ln
 .KEEP_STATE:
 
 all: $(LIBS)
- 
+
 lint: $$(LINTSRC)
 	$(LINT.c) $(LINTCHECKFLAGS) $(LINTSRC) $(LDLIBS)
 
diff --git a/usr/src/lib/print/libhttp-core/Makefile.com b/usr/src/lib/print/libhttp-core/Makefile.com
index cfb8ae8730..f8412cd381 100644
--- a/usr/src/lib/print/libhttp-core/Makefile.com
+++ b/usr/src/lib/print/libhttp-core/Makefile.com
@@ -22,8 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =		libhttp-core.a
 VERS =			.1
@@ -47,6 +46,9 @@ CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(SRCDIR)
 CPPFLAGS +=	-I../../libpapi-common/common
 
+# not linted
+SMATCH=off
+
 MAPFILES =	$(SRCDIR)/mapfile
 
 LDLIBS +=	-lsocket -lnsl -lc
diff --git a/usr/src/lib/print/libipp-core/Makefile.com b/usr/src/lib/print/libipp-core/Makefile.com
index 26f48c2dbb..20c9a1e5ac 100644
--- a/usr/src/lib/print/libipp-core/Makefile.com
+++ b/usr/src/lib/print/libipp-core/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =		libipp-core.a
 VERS =			.0
@@ -46,6 +47,8 @@ CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-char-subscripts
 CERRWARN +=	-_gcc=-Wno-switch
 
+SMOFF += all_func_returns
+
 MAPFILES =	$(SRCDIR)/mapfile
 
 LDLIBS +=	-lpapi-common -lc
diff --git a/usr/src/lib/print/libipp-listener/Makefile.com b/usr/src/lib/print/libipp-listener/Makefile.com
index 4db2966ceb..a111a471e0 100644
--- a/usr/src/lib/print/libipp-listener/Makefile.com
+++ b/usr/src/lib/print/libipp-listener/Makefile.com
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =		libipp-listener.a
 VERS =			.0
@@ -55,6 +55,9 @@ CPPFLAGS +=	-I../../libipp-core/common
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 MAPFILES =	$(SRCDIR)/mapfile
 
 LDLIBS +=	-lipp-core -lpapi -lc -lsocket -lnsl
diff --git a/usr/src/lib/print/libpapi-common/Makefile.com b/usr/src/lib/print/libpapi-common/Makefile.com
index 7948a2261e..2f09a330ac 100644
--- a/usr/src/lib/print/libpapi-common/Makefile.com
+++ b/usr/src/lib/print/libpapi-common/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =		libpapi-common.a
 VERS =			.0
@@ -43,6 +44,9 @@ CPPFLAGS +=	-I$(SRCDIR)
 
 CERRWARN +=	-_gcc=-Wno-switch
 
+# not linted
+SMATCH=off
+
 MAPFILES =	$(SRCDIR)/mapfile
 
 LDLIBS +=	-lc -lsocket -lnsl
diff --git a/usr/src/lib/print/libpapi-dynamic/Makefile.com b/usr/src/lib/print/libpapi-dynamic/Makefile.com
index 8a51154c48..daab165a1d 100644
--- a/usr/src/lib/print/libpapi-dynamic/Makefile.com
+++ b/usr/src/lib/print/libpapi-dynamic/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =		libpapi.a
 VERS =			.0
@@ -48,6 +49,8 @@ LDLIBS +=	-lc
 
 CERRWARN +=	-_gcc=-Wno-unused-variable
 
+SMOFF += all_func_returns
+
 .KEEP_STATE:
 
 all:	$(LIBS)
diff --git a/usr/src/lib/print/libpapi-ipp/Makefile.com b/usr/src/lib/print/libpapi-ipp/Makefile.com
index f5abebce00..b96b6fef71 100644
--- a/usr/src/lib/print/libpapi-ipp/Makefile.com
+++ b/usr/src/lib/print/libpapi-ipp/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =		psm-ipp.a
 VERS =			.1
@@ -54,6 +55,9 @@ CERRWARN +=	-_gcc=-Wno-type-limits
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 MAPFILES =	$(SRCDIR)/mapfile
 
 LDLIBS +=	-L$(ROOTLIBDIR) -R/usr/lib/print -lhttp-core -lmd5
diff --git a/usr/src/lib/print/libpapi-lpd/Makefile.com b/usr/src/lib/print/libpapi-lpd/Makefile.com
index 9c0a8af8df..1e24f80ac5 100644
--- a/usr/src/lib/print/libpapi-lpd/Makefile.com
+++ b/usr/src/lib/print/libpapi-lpd/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =		psm-lpd.a
 VERS =			.1
@@ -51,6 +52,9 @@ CPPFLAGS +=	-I../../libpapi-common/common
 
 CERRWARN +=	-_gcc=-Wno-unused-variable
 
+# not linted
+SMATCH=off
+
 MAPFILES =	$(SRCDIR)/mapfile
 
 LDLIBS +=	-lc
diff --git a/usr/src/lib/print/libprint/Makefile.com b/usr/src/lib/print/libprint/Makefile.com
index 88fbb532b0..47492ab7c8 100644
--- a/usr/src/lib/print/libprint/Makefile.com
+++ b/usr/src/lib/print/libprint/Makefile.com
@@ -22,8 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =		libprint.a
 VERS =			.2
@@ -46,6 +45,9 @@ CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(SRCDIR)
 CPPFLAGS +=	-I../../head -D_REENTRANT
 
+# not linted
+SMATCH=off
+
 LDLIBS +=	-lnsl -lsocket -lc -lldap
 
 
diff --git a/usr/src/lib/rpcsec_gss/Makefile.com b/usr/src/lib/rpcsec_gss/Makefile.com
index 53287d4664..2dca6fe9e2 100644
--- a/usr/src/lib/rpcsec_gss/Makefile.com
+++ b/usr/src/lib/rpcsec_gss/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= rpcsec.a
 VERS = .1
@@ -40,6 +41,9 @@ CFLAGS64 +=	$(XFFLAG)
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+# not linted
+SMATCH=off
+
 DYNFLAGS +=	$(ZIGNORE)
 
 LINTSRC=	$(LINTLIB:%.ln=%)
diff --git a/usr/src/lib/sasl_plugins/Makefile.com b/usr/src/lib/sasl_plugins/Makefile.com
index 043c3eb01c..09eb2bd2bd 100644
--- a/usr/src/lib/sasl_plugins/Makefile.com
+++ b/usr/src/lib/sasl_plugins/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 COMMONOBJS=	plugin_common.o
 OBJECTS=	$(PLUG_OBJS) $(COMMONOBJS)
@@ -32,6 +33,9 @@ CPPFLAGS +=	-I$(SRC)/lib/libsasl/include
 
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 LIBS =		$(DYNLIB)
 SRCS=		$(PLUG_OBJS:%.o=../%.c) \
 		$(COMMONOBJS:%.o=$(SRC)/lib/libsasl/plugin/%.c)
diff --git a/usr/src/lib/scsi/libses/Makefile.defs b/usr/src/lib/scsi/libses/Makefile.defs
index 91c04eeeec..32f6075d32 100644
--- a/usr/src/lib/scsi/libses/Makefile.defs
+++ b/usr/src/lib/scsi/libses/Makefile.defs
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 SRCS = $(OBJECTS:%.o=../common/%.c)
 CSTD = $(CSTD_GNU99)
@@ -33,6 +34,8 @@ CERRWARN += -_gcc=-Wno-type-limits
 CERRWARN += -_gcc=-Wno-uninitialized
 CERRWARN += -_gcc=-Wno-unused-label
 
+SMOFF += all_func_returns
+
 ROOTLIBDIR = $(ROOTSCSILIBDIR)
 ROOTLIBDIR64 = $(ROOTSCSILIBDIR)/$(MACH64)
 
diff --git a/usr/src/lib/scsi/libsmp/Makefile.com b/usr/src/lib/scsi/libsmp/Makefile.com
index 428e4e795c..13760167b9 100644
--- a/usr/src/lib/scsi/libsmp/Makefile.com
+++ b/usr/src/lib/scsi/libsmp/Makefile.com
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY = libsmp.a
 VERS = .1
@@ -44,6 +45,8 @@ CFLAGS += $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-type-limits
 CERRWARN += -_gcc=-Wno-uninitialized
 
+SMOFF += all_func_returns
+
 LDLIBS += \
 	-lumem \
 	-lc
diff --git a/usr/src/lib/scsi/plugins/scsi/engines/uscsi/Makefile.com b/usr/src/lib/scsi/plugins/scsi/engines/uscsi/Makefile.com
index ed98d38b11..8917816b7c 100644
--- a/usr/src/lib/scsi/plugins/scsi/engines/uscsi/Makefile.com
+++ b/usr/src/lib/scsi/plugins/scsi/engines/uscsi/Makefile.com
@@ -23,9 +23,11 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 2018, Joyent, Inc.
 
 MODULE =	uscsi
 SRCS =		uscsi.c
 
 include ../../Makefile.engine
+
+SMOFF += signed
diff --git a/usr/src/lib/smbsrv/libfksmbsrv/Makefile.com b/usr/src/lib/smbsrv/libfksmbsrv/Makefile.com
index cfc1776993..074e316b28 100644
--- a/usr/src/lib/smbsrv/libfksmbsrv/Makefile.com
+++ b/usr/src/lib/smbsrv/libfksmbsrv/Makefile.com
@@ -24,6 +24,7 @@
 #
 # Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libfksmbsrv.a
 VERS =		.1
@@ -215,6 +216,9 @@ CPPFLAGS += -DDEBUG
 CERRWARN += -_gcc=-Wno-parentheses
 CERRWARN += -_gcc=-Wno-switch
 
+# not linted
+SMATCH=off
+
 SRCS=   $(OBJS_LOCAL:%.o=$(SRCDIR)/%.c) \
 	$(OBJS_FS_SMBSRV:%.o=$(SRC)/uts/common/fs/smbsrv/%.c) \
 	$(OBJS_CMN_SMBSRV:%.o=$(SRC)/common/smbsrv/%.c)
diff --git a/usr/src/lib/smbsrv/libmlsvc/Makefile.com b/usr/src/lib/smbsrv/libmlsvc/Makefile.com
index 50e596caa4..a613eb24b4 100644
--- a/usr/src/lib/smbsrv/libmlsvc/Makefile.com
+++ b/usr/src/lib/smbsrv/libmlsvc/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libmlsvc.a
 VERS =		.1
@@ -93,6 +94,10 @@ $(ENABLE_SMB_PRINTING) CPPFLAGS += -DHAVE_CUPS
 CERRWARN += -_gcc=-Wno-unused-function
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
+
 SRCS=   $(OBJS_COMMON:%.o=$(SRCDIR)/%.c)
 
 include ../../Makefile.targ
diff --git a/usr/src/lib/smbsrv/libsmb/Makefile.com b/usr/src/lib/smbsrv/libsmb/Makefile.com
index 78dc4fdcfa..fd685fc2f9 100644
--- a/usr/src/lib/smbsrv/libsmb/Makefile.com
+++ b/usr/src/lib/smbsrv/libsmb/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= libsmb.a
 VERS= .1
@@ -88,6 +89,9 @@ CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-char-subscripts
 CERRWARN +=	-_gcc=-Wno-switch
 
+# not linted
+SMATCH=off
+
 SRCS=   $(OBJS_COMMON:%.o=$(SRCDIR)/%.c)	\
 	$(OBJS_SHARED:%.o=$(SRC)/common/smbsrv/%.c)
 
diff --git a/usr/src/lib/smbsrv/libsmbns/Makefile.com b/usr/src/lib/smbsrv/libsmbns/Makefile.com
index e0dd1beec7..8011d3305a 100644
--- a/usr/src/lib/smbsrv/libsmbns/Makefile.com
+++ b/usr/src/lib/smbsrv/libsmbns/Makefile.com
@@ -20,7 +20,8 @@
 #
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
-# 
+#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= libsmbns.a
 VERS= .1
@@ -56,6 +57,9 @@ CPPFLAGS +=	-Dsyslog=smb_syslog
 CERRWARN +=	-_gcc=-Wno-unused-function
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 # DYNLIB libraries do not have lint libs and are not linted
 $(DYNLIB) :=	LDLIBS += -lkrb5
 
diff --git a/usr/src/lib/smhba/Makefile.com b/usr/src/lib/smhba/Makefile.com
index 61a498eaeb..d512f5b80a 100644
--- a/usr/src/lib/smhba/Makefile.com
+++ b/usr/src/lib/smhba/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 
 LIBRARY =	libSMHBAAPI.a
@@ -49,6 +50,8 @@ CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-unused-function
 
+SMOFF += indenting,all_func_returns
+
 LDLIBS +=	-lc
 
 $(LINTLIB) := SRCS=	$(SRCDIR)/$(LINTSRC)
diff --git a/usr/src/lib/sun_sas/Makefile.com b/usr/src/lib/sun_sas/Makefile.com
index f6457c7c8e..a4c1ea4b0b 100644
--- a/usr/src/lib/sun_sas/Makefile.com
+++ b/usr/src/lib/sun_sas/Makefile.com
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY =	libsun_sas.a
 VERS =		.1
@@ -84,6 +84,9 @@ CPPFLAGS +=	-DBUILD_TIME='"Wed Feb 4 12:00:00 2009"'
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-unused-value
 
+# not linted
+SMATCH=off
+
 LDLIBS		+= -ldevinfo
 LDLIBS		+= -lsysevent
 LDLIBS		+= -lnvpair
diff --git a/usr/src/lib/udapl/udapl_tavor/Makefile.com b/usr/src/lib/udapl/udapl_tavor/Makefile.com
index 75780c71be..4671bea78d 100644
--- a/usr/src/lib/udapl/udapl_tavor/Makefile.com
+++ b/usr/src/lib/udapl/udapl_tavor/Makefile.com
@@ -22,9 +22,10 @@
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
-LIBRARY=       	udapl_tavor.a 
-VERS=          	.1 
+LIBRARY=       	udapl_tavor.a
+VERS=          	.1
 
 LOCOBJS =	\
 	dapl_cno_create.o \
@@ -139,7 +140,7 @@ TAVORSRCDIR =	../tavor
 
 SRCS = $(LOCOBJS:%.o=$(SRCDIR)/%.c) $(TAVOROBJS:%.o=$(TAVORSRCDIR)/%.c)
 
-CPPFLAGS +=	-I$(SRC)/lib/udapl/udapl_tavor/include 
+CPPFLAGS +=	-I$(SRC)/lib/udapl/udapl_tavor/include
 CPPFLAGS +=	-I$(SRC)/lib/udapl/udapl_tavor/tavor
 CPPFLAGS +=	-I$(SRC)/uts/common/sys/ib/clients/daplt
 CPPFLAGS +=	-I$(SRC)/uts/common
@@ -152,6 +153,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-switch
 
+# not linted
+SMATCH=off
+
 $(NOT_RELEASE_BUILD)CPPFLAGS += -DDAPL_DBG
 debug := COPTFLAG = -g
 debug := COPTFLAG64 = -g
diff --git a/usr/src/lib/watchmalloc/Makefile.com b/usr/src/lib/watchmalloc/Makefile.com
index eabd4993bc..c4cb542ac3 100644
--- a/usr/src/lib/watchmalloc/Makefile.com
+++ b/usr/src/lib/watchmalloc/Makefile.com
@@ -42,6 +42,9 @@ DYNFLAGS += $(ZINTERPOSE)
 
 CERRWARN += -_gcc=-Wno-unused-label
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/tools/smatch/Makefile b/usr/src/tools/smatch/Makefile
index 4386f8dd66..7c18c6ce72 100644
--- a/usr/src/tools/smatch/Makefile
+++ b/usr/src/tools/smatch/Makefile
@@ -131,6 +131,8 @@ BUILT_HEADERS = src/version.h src/check_list_local.h
 
 .KEEP_STATE:
 
+.PARALLEL: $(OBJS)
+
 all: $(PROG)
 
 install: all .WAIT $(ROOTONBLDMACHPROG) $(ROOTONBLDDATAFILES)
diff --git a/usr/src/ucbcmd/Makefile.ucbcmd b/usr/src/ucbcmd/Makefile.ucbcmd
index e9156f269d..5eb4ee73e7 100644
--- a/usr/src/ucbcmd/Makefile.ucbcmd
+++ b/usr/src/ucbcmd/Makefile.ucbcmd
@@ -23,6 +23,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 #
 # ucbcmd/Makefile.ucbcmd
 #
@@ -58,6 +59,9 @@ ROOTPROG32=	$(PROG:%=$(ROOTBIN32)/%)
 
 ISAEXEC=	$(ROOT)/usr/lib/isaexec
 
+# don't lint any of ucbcmd
+SMATCH=off
+
 # storing LDLIBS in two macros allows reordering of options
 LDLIBS.cmd =    $(ENVLDLIBS1)  $(ENVLDLIBS2)  $(ENVLDLIBS3)
 LDLIBS =        $(LDLIBS.cmd)
diff --git a/usr/src/ucblib/libcurses/Makefile.com b/usr/src/ucblib/libcurses/Makefile.com
index 4c1d763415..3e018e1cfa 100644
--- a/usr/src/ucblib/libcurses/Makefile.com
+++ b/usr/src/ucblib/libcurses/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libcurses.a
 VERS=		.1
@@ -89,6 +90,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/ucblib/libdbm/dbm.c b/usr/src/ucblib/libdbm/dbm.c
index f006db5ea9..e9afce9d15 100644
--- a/usr/src/ucblib/libdbm/dbm.c
+++ b/usr/src/ucblib/libdbm/dbm.c
@@ -31,6 +31,10 @@
  * under license from the Regents of the University of California.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 /*LINTLIBRARY*/
 
 #include	<sys/types.h>
@@ -524,12 +528,12 @@ delitem(char buf[PBLKSIZ], int n)
 		i2 = sp[n+1-1];
 	i3 = sp[sp[0]+1-1];
 	if (i2 > i1)
-	while (i1 > i3) {
-		i1--;
-		i2--;
-		buf[i2] = buf[i1];
-		buf[i1] = 0;
-	}
+		while (i1 > i3) {
+			i1--;
+			i2--;
+			buf[i2] = buf[i1];
+			buf[i1] = 0;
+		}
 	i2 -= i1;
 	for (i1 = n+1; i1 < sp[0]; i1++)
 		sp[i1+1-1] = sp[i1+1] + i2;
diff --git a/usr/src/ucblib/librpcsoc/Makefile.com b/usr/src/ucblib/librpcsoc/Makefile.com
index 5807512ec3..a99827f813 100644
--- a/usr/src/ucblib/librpcsoc/Makefile.com
+++ b/usr/src/ucblib/librpcsoc/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY= librpcsoc.a
 VERS = .1
@@ -51,6 +52,9 @@ CPPFLAGS = -I$(SRC)/ucbhead -I../../../lib/libc/inc $(CPPFLAGS.master)
 
 CERRWARN += -_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 lint: lintcheck
diff --git a/usr/src/ucblib/libtermcap/Makefile.com b/usr/src/ucblib/libtermcap/Makefile.com
index 2bc6e3ca2e..b569240946 100644
--- a/usr/src/ucblib/libtermcap/Makefile.com
+++ b/usr/src/ucblib/libtermcap/Makefile.com
@@ -22,6 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libtermcap.a
 VERS=		.1
@@ -45,6 +46,9 @@ LDLIBS +=	-lc
 DEFS= -DCM_N -DCM_GT -DCM_B -DCM_D
 CPPFLAGS = $(DEFS) -I$(SRC)/ucbhead $(CPPFLAGS.master)
 
+# not linted
+SMATCH=off
+
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/ucblib/libucb/Makefile.com b/usr/src/ucblib/libucb/Makefile.com
index 70b5ff2703..bb277af674 100644
--- a/usr/src/ucblib/libucb/Makefile.com
+++ b/usr/src/ucblib/libucb/Makefile.com
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 #
+# Copyright (c) 2018, Joyent, Inc.
 
 LIBRARY=	libucb.a
 VERS=		.1
@@ -98,6 +99,9 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-char-subscripts
 CERRWARN +=	-_gcc=-Wno-uninitialized
 
+# not linted
+SMATCH=off
+
 ASFLAGS= -P -D__STDC__ -DLOCORE -D_SYS_SYS_S -D_ASM $(CPPFLAGS)
 
 pics/%.o:= ASFLAGS += $(AS_PICFLAGS)
diff --git a/usr/src/uts/common/c2/audit_event.c b/usr/src/uts/common/c2/audit_event.c
index 5ccdba6965..cb75b17e3c 100644
--- a/usr/src/uts/common/c2/audit_event.c
+++ b/usr/src/uts/common/c2/audit_event.c
@@ -22,6 +22,7 @@
 /*
  * Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2011 Bayard G. Bell. All rights reserved.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 
 /*
@@ -2340,9 +2341,9 @@ aus_ioctl(struct t_audit_data *tad)
 		au_uwrite(au_to_arg32(1, "fd", fd));
 		au_uwrite(au_to_arg32(2, "cmd", cmd));
 #ifndef _LP64
-			au_uwrite(au_to_arg32(3, "arg", (uint32_t)cmarg));
+		au_uwrite(au_to_arg32(3, "arg", (uint32_t)cmarg));
 #else
-			au_uwrite(au_to_arg64(3, "arg", (uint64_t)cmarg));
+		au_uwrite(au_to_arg64(3, "arg", (uint64_t)cmarg));
 #endif
 		return;
 	}
@@ -2363,9 +2364,9 @@ aus_ioctl(struct t_audit_data *tad)
 
 	au_uwrite(au_to_arg32(2, "cmd", cmd));
 #ifndef _LP64
-		au_uwrite(au_to_arg32(3, "arg", (uint32_t)cmarg));
+	au_uwrite(au_to_arg32(3, "arg", (uint32_t)cmarg));
 #else
-		au_uwrite(au_to_arg64(3, "arg", (uint64_t)cmarg));
+	au_uwrite(au_to_arg64(3, "arg", (uint64_t)cmarg));
 #endif
 }
 
diff --git a/usr/src/uts/common/fs/nfs/nfs_dlinet.c b/usr/src/uts/common/fs/nfs/nfs_dlinet.c
index 34658b161f..dfb7a15466 100644
--- a/usr/src/uts/common/fs/nfs/nfs_dlinet.c
+++ b/usr/src/uts/common/fs/nfs/nfs_dlinet.c
@@ -23,6 +23,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -1143,7 +1147,7 @@ dhcpinit(void)
 						    "dhcp: couldn't add route "
 						    "to %s: %m.\n",
 						    inet_ntoa(defr));
-							continue;
+						continue;
 					}
 					if (dldebug) {
 						printf("dhcp: added route %s\n",
diff --git a/usr/src/uts/common/fs/portfs/port_fop.c b/usr/src/uts/common/fs/portfs/port_fop.c
index 045958059a..019de0540a 100644
--- a/usr/src/uts/common/fs/portfs/port_fop.c
+++ b/usr/src/uts/common/fs/portfs/port_fop.c
@@ -24,7 +24,7 @@
  */
 
 /*
- * Copyright (c) 2013, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 
 /*
@@ -2029,7 +2029,7 @@ port_fop_unmount(fsemarg_t *vf, int flag, cred_t *cr)
 	 * the hash list.
 	 */
 	for (pvfsp = *ppvfsp; pvfsp->pvfs != vfsp; pvfsp = pvfsp->pvfs_next)
-	;
+		;
 
 	/*
 	 * For some of the filesystems, allow unmounts to proceed only if
@@ -2079,7 +2079,7 @@ port_fop_unmount(fsemarg_t *vf, int flag, cred_t *cr)
 	mutex_enter(mtx);
 	for (; *ppvfsp && (*ppvfsp)->pvfs != vfsp;
 	    ppvfsp = &(*ppvfsp)->pvfs_next)
-	;
+		;
 
 	/*
 	 * remove and free it.
diff --git a/usr/src/uts/common/inet/ip/ip_mroute.c b/usr/src/uts/common/inet/ip/ip_mroute.c
index dfac414613..087d0b72e5 100644
--- a/usr/src/uts/common/inet/ip/ip_mroute.c
+++ b/usr/src/uts/common/inet/ip/ip_mroute.c
@@ -24,6 +24,10 @@
 /* Copyright (c) 1990 Mentat Inc. */
 
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * Procedures for the kernel part of DVMRP,
  * a Distance-Vector Multicast Routing Protocol.
  * (See RFC-1075)
@@ -720,7 +724,7 @@ ip_mrouter_done(ip_stack_t *ipst)
 					mutex_exit(&mfc_rt->mfc_mutex);
 					(void) untimeout(
 					    mfc_rt->mfc_timeout_id);
-						mfc_rt->mfc_timeout_id = 0;
+					mfc_rt->mfc_timeout_id = 0;
 					mutex_enter(&mfc_rt->mfc_mutex);
 
 					/*
diff --git a/usr/src/uts/common/inet/ip/ip_ndp.c b/usr/src/uts/common/inet/ip/ip_ndp.c
index eabe8949ae..211e56633f 100644
--- a/usr/src/uts/common/inet/ip/ip_ndp.c
+++ b/usr/src/uts/common/inet/ip/ip_ndp.c
@@ -22,6 +22,10 @@
  * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/stream.h>
 #include <sys/stropts.h>
@@ -4955,7 +4959,7 @@ nce_fuzz_interval(clock_t intv, boolean_t initial_time)
 			frac = 2;
 		/* Set intv randomly in the range [intv-frac .. intv+frac] */
 		if ((intv = intv - frac + rnd % (2 * frac + 1)) <= 0)
-		intv = 1;
+			intv = 1;
 	}
 	return (intv);
 }
diff --git a/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_chan.c b/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_chan.c
index 7301983986..e2a85f6c3a 100644
--- a/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_chan.c
+++ b/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_chan.c
@@ -24,6 +24,10 @@
  */
 
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * routines common to isoch receive and isoch transmit
  */
 #include <sys/stat.h>
@@ -614,10 +618,11 @@ av1394_ic_dma_sync_frames(av1394_ic_t *icp, int idx, int cnt,
 
 	nsegs = (cnt / fps) + 1;
 
-		seg = idx / fps;
-		for (;;) {
-			(void) ddi_dma_sync(pool->ip_seg[seg].is_dma_hdl, 0,
-			    icp->ic_framesz, type);
+	seg = idx / fps;
+
+	for (;;) {
+		(void) ddi_dma_sync(pool->ip_seg[seg].is_dma_hdl, 0,
+		    icp->ic_framesz, type);
 
 		--nsegs;
 		if (nsegs == 0)
diff --git a/usr/src/uts/common/io/1394/targets/dcam1394/dcam.c b/usr/src/uts/common/io/1394/targets/dcam1394/dcam.c
index e1acea0878..c300e987d8 100644
--- a/usr/src/uts/common/io/1394/targets/dcam1394/dcam.c
+++ b/usr/src/uts/common/io/1394/targets/dcam1394/dcam.c
@@ -21,7 +21,7 @@
 /*
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
- * Copyright 2017 Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 
 
@@ -193,7 +193,7 @@ _fini(void)
 	}
 
 #ifndef NPROBE
-		(void) tnf_mod_unload(&modlinkage);
+	(void) tnf_mod_unload(&modlinkage);
 #endif /* ! NPROBE */
 
 	ddi_soft_state_fini(&dcam_state_p);
diff --git a/usr/src/uts/common/io/aac/aac.c b/usr/src/uts/common/io/aac/aac.c
index c0d3f5c89d..fd302ad599 100644
--- a/usr/src/uts/common/io/aac/aac.c
+++ b/usr/src/uts/common/io/aac/aac.c
@@ -3,6 +3,7 @@
  */
 
 /*
+ * Copyright (c) 2018, Joyent, Inc.
  * Copyright 2005-08 Adaptec, Inc.
  * Copyright (c) 2005-08 Adaptec Inc., Achim Leubner
  * Copyright (c) 2000 Michael Smith
@@ -7312,7 +7313,7 @@ aac_config_tgt(struct aac_softstate *softs, int tgt)
 		if (bp == NULL) {
 			if ((bp = scsi_alloc_consistent_buf(&ap, NULL,
 			    buf_len, B_READ, NULL_FUNC, NULL)) == NULL)
-			return (AACERR);
+				return (AACERR);
 		}
 		if ((pkt = scsi_init_pkt(&ap, NULL, bp, CDB_GROUP5,
 		    sizeof (struct scsi_arq_status), 0, PKT_CONSISTENT,
diff --git a/usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/clc.h b/usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/clc.h
index 47d383a64c..d4faa2dca1 100644
--- a/usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/clc.h
+++ b/usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/clc.h
@@ -82,10 +82,6 @@ extern void elink_cb_notify_link_changed(struct elink_dev *cb);
 #define ELINK_EVENT_ID_SFP_UNQUALIFIED_MODULE 	1
 #define ELINK_EVENT_ID_SFP_POWER_FAULT 		2
 
-#ifdef ELINK_AUX_POWER
-#define elink_cb_event_log(cb, level, ...)
-#define elink_cb_get_friendly_name(cb) ''
-#endif /*ELINK_AUX_POWER */
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
 #endif
diff --git a/usr/src/uts/common/io/cryptmod.c b/usr/src/uts/common/io/cryptmod.c
index 7d7626e2ef..e2315e8e9e 100644
--- a/usr/src/uts/common/io/cryptmod.c
+++ b/usr/src/uts/common/io/cryptmod.c
@@ -2,6 +2,8 @@
  * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
+ * Copyright (c) 2018, Joyent, Inc.
+ *
  * STREAMS Crypto Module
  *
  * This module is used to facilitate Kerberos encryption
@@ -3003,7 +3005,7 @@ encrypt_block(queue_t *q, struct tmodinfo *tmi, mblk_t *mp, size_t plainlen)
 		if (cbp == NULL) {
 			cmn_err(CE_WARN,
 				"allocb (%d bytes) failed", sz);
-				return (NULL);
+			return (NULL);
 		}
 
 		cbp->b_cont = mp->b_cont;
diff --git a/usr/src/uts/common/io/dld/dld_proto.c b/usr/src/uts/common/io/dld/dld_proto.c
index b09d4db0f5..238dd9bb22 100644
--- a/usr/src/uts/common/io/dld/dld_proto.c
+++ b/usr/src/uts/common/io/dld/dld_proto.c
@@ -21,7 +21,7 @@
 /*
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2012, Nexenta Systems, Inc. All rights reserved.
- * Copyright 2018 Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 
 /*
@@ -844,7 +844,7 @@ proto_disabmulti_req(dld_str_t *dsp, mblk_t *mp)
 	mac_perim_exit(mph);
 
 	if (err != 0) {
-	switch (err) {
+		switch (err) {
 		case EINVAL:
 			dl_err = DL_BADADDR;
 			err = 0;
diff --git a/usr/src/uts/common/io/fd.c b/usr/src/uts/common/io/fd.c
index fadd776414..d591e04331 100644
--- a/usr/src/uts/common/io/fd.c
+++ b/usr/src/uts/common/io/fd.c
@@ -23,6 +23,9 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
 
 /*
  * Floppy Disk driver
@@ -1769,7 +1772,7 @@ get_geom:
 		if (rval != 0)
 			break;
 
-	if (fc.fdc_cmd == FDCMD_READ || fc.fdc_cmd == FDCMD_WRITE) {
+		if (fc.fdc_cmd == FDCMD_READ || fc.fdc_cmd == FDCMD_WRITE) {
 			auto struct iovec aiov;
 			auto struct uio auio;
 			struct uio *uio = &auio;
diff --git a/usr/src/uts/common/io/fibre-channel/fca/oce/oce_gld.c b/usr/src/uts/common/io/fibre-channel/fca/oce/oce_gld.c
index 19d210d4d1..846f8896d9 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/oce/oce_gld.c
+++ b/usr/src/uts/common/io/fibre-channel/fca/oce/oce_gld.c
@@ -22,6 +22,10 @@
 /* Copyright © 2003-2011 Emulex. All rights reserved.  */
 
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * Source file containing the implementation of the driver entry points
  * and related helper functions
  */
@@ -210,7 +214,7 @@ oce_m_multicast(void *arg, boolean_t add, const uint8_t *mca)
 		ret = oce_set_multicast_table(dev, dev->if_id,
 		    &mca_hw_list[0], new_mcnt, B_FALSE);
 	}
-		if (ret != 0) {
+	if (ret != 0) {
 		oce_log(dev, CE_WARN, MOD_CONFIG,
 		    "mcast %s fails", add ? "ADD" : "DEL");
 		DEV_UNLOCK(dev);
diff --git a/usr/src/uts/common/io/fibre-channel/fca/oce/oce_mbx.c b/usr/src/uts/common/io/fibre-channel/fca/oce/oce_mbx.c
index 96f7b19e02..3de0aa1116 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/oce/oce_mbx.c
+++ b/usr/src/uts/common/io/fibre-channel/fca/oce/oce_mbx.c
@@ -21,6 +21,9 @@
 
 /* Copyright © 2003-2011 Emulex. All rights reserved.  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
 
 /*
  * Source file containing the implementation of MBOX
@@ -156,7 +159,7 @@ oce_mbox_wait(struct oce_dev *dev, uint32_t tmo_sec)
 		if (mbox_db.bits.ready) {
 			return (0);
 		}
-			drv_usecwait(5);
+		drv_usecwait(5);
 	}
 
 	return (ETIMEDOUT);
diff --git a/usr/src/uts/common/io/fibre-channel/fca/qlge/qlge.c b/usr/src/uts/common/io/fibre-channel/fca/qlge/qlge.c
index e624ea7cf1..213dbc51b0 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/qlge/qlge.c
+++ b/usr/src/uts/common/io/fibre-channel/fca/qlge/qlge.c
@@ -23,6 +23,10 @@
  * Copyright 2010 QLogic Corporation. All rights reserved.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <qlge.h>
 #include <sys/atomic.h>
 #include <sys/strsubr.h>
@@ -2400,7 +2404,7 @@ ql_set_rx_cksum(mblk_t *mp, struct ib_mac_iocb_rsp *net_rsp)
 	/* Not TCP or UDP packet? nothing more to do */
 	if (((net_rsp->flags2 & IB_MAC_IOCB_RSP_T) == 0) &&
 	    ((net_rsp->flags2 & IB_MAC_IOCB_RSP_U) == 0))
-	return;
+		return;
 
 	/* No CKO support for IPv6 */
 	if ((net_rsp->flags3 & IB_MAC_IOCB_RSP_V6) != 0)
diff --git a/usr/src/uts/common/io/ib/clients/rds/rdsddi.c b/usr/src/uts/common/io/ib/clients/rds/rdsddi.c
index 8a78af2b51..35e7a55154 100644
--- a/usr/src/uts/common/io/ib/clients/rds/rdsddi.c
+++ b/usr/src/uts/common/io/ib/clients/rds/rdsddi.c
@@ -23,6 +23,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/conf.h>
 #include <sys/modctl.h>
@@ -839,7 +843,7 @@ rds_wrw(queue_t *q, struiod_t *dp)
 			/* Detect valid T_UNITDATA_REQ here */
 			if (((union T_primitives *)(uintptr_t)rptr)->type
 			    == T_UNITDATA_REQ)
-			break;
+				break;
 		}
 		/* FALLTHRU */
 	default:
diff --git a/usr/src/uts/common/io/ib/ibnex/ibnex.c b/usr/src/uts/common/io/ib/ibnex/ibnex.c
index 46defb6cbc..d25c6ddf05 100644
--- a/usr/src/uts/common/io/ib/ibnex/ibnex.c
+++ b/usr/src/uts/common/io/ib/ibnex/ibnex.c
@@ -23,6 +23,10 @@
  */
 
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * The InfiniBand  Nexus driver (IB nexus) is a bus nexus driver for IB bus.
  * It supports  Port nodes, Virtual Physical Point of Attachment nodes (VPPA)
  * for  HCAs registered with IBTL and IOC nodes for all the IOCs present in
@@ -2863,7 +2867,7 @@ ibnex_comm_svc_init(char *property, ibnex_node_type_t type)
 				IBTF_DPRINTF_L2("ibnex", "\tcomm_svc_init : "
 				    "Service name %s invalid : Not unique",
 				    servicep[count]);
-					continue;
+				continue;
 			}
 
 		valid[count] = 1;
diff --git a/usr/src/uts/common/io/iwp/iwp.c b/usr/src/uts/common/io/iwp/iwp.c
index eec2b84664..69e2c928df 100644
--- a/usr/src/uts/common/io/iwp/iwp.c
+++ b/usr/src/uts/common/io/iwp/iwp.c
@@ -1,4 +1,8 @@
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -3832,21 +3836,21 @@ iwp_hw_set_before_auth(iwp_sc_t *sc)
 	IEEE80211_ADDR_COPY(sc->sc_config.bssid, in->in_bssid);
 	sc->sc_config.chan = LE_16(ieee80211_chan2ieee(ic, in->in_chan));
 
-		sc->sc_config.ofdm_ht_triple_stream_basic_rates = 0;
-		sc->sc_config.ofdm_ht_dual_stream_basic_rates = 0;
-		sc->sc_config.ofdm_ht_single_stream_basic_rates = 0;
-
-		if (IEEE80211_MODE_11B == ic->ic_curmode) {
-			sc->sc_config.cck_basic_rates  = 0x03;
-			sc->sc_config.ofdm_basic_rates = 0;
-		} else if ((in->in_chan != IEEE80211_CHAN_ANYC) &&
-		    (IEEE80211_IS_CHAN_5GHZ(in->in_chan))) {
-			sc->sc_config.cck_basic_rates  = 0;
-			sc->sc_config.ofdm_basic_rates = 0x15;
-		} else { /* assume 802.11b/g */
-			sc->sc_config.cck_basic_rates  = 0x0f;
-			sc->sc_config.ofdm_basic_rates = 0xff;
-		}
+	sc->sc_config.ofdm_ht_triple_stream_basic_rates = 0;
+	sc->sc_config.ofdm_ht_dual_stream_basic_rates = 0;
+	sc->sc_config.ofdm_ht_single_stream_basic_rates = 0;
+
+	if (IEEE80211_MODE_11B == ic->ic_curmode) {
+		sc->sc_config.cck_basic_rates  = 0x03;
+		sc->sc_config.ofdm_basic_rates = 0;
+	} else if ((in->in_chan != IEEE80211_CHAN_ANYC) &&
+	    (IEEE80211_IS_CHAN_5GHZ(in->in_chan))) {
+		sc->sc_config.cck_basic_rates  = 0;
+		sc->sc_config.ofdm_basic_rates = 0x15;
+	} else { /* assume 802.11b/g */
+		sc->sc_config.cck_basic_rates  = 0x0f;
+		sc->sc_config.ofdm_basic_rates = 0xff;
+	}
 
 	sc->sc_config.flags &= ~LE_32(RXON_FLG_SHORT_PREAMBLE_MSK |
 	    RXON_FLG_SHORT_SLOT_MSK);
diff --git a/usr/src/uts/common/io/nge/nge_chip.c b/usr/src/uts/common/io/nge/nge_chip.c
index 04a5858840..0bef9ff505 100644
--- a/usr/src/uts/common/io/nge/nge_chip.c
+++ b/usr/src/uts/common/io/nge/nge_chip.c
@@ -24,6 +24,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include "nge.h"
 static uint32_t	nge_watchdog_count	= 1 << 5;
 static uint32_t	nge_watchdog_check	= 1 << 3;
@@ -1010,25 +1014,25 @@ nge_chip_reset(nge_t *ngep)
 		mac = uaddr1.addr_bits.addr;
 		mac <<= 32;
 		mac |= nge_reg_get32(ngep, NGE_UNI_ADDR0);
-			ngep->chipinfo.hw_mac_addr = mac;
-			if (ngep->dev_spec_param.mac_addr_order) {
-				for (i = 0; i < ETHERADDRL; i++) {
-					ngep->chipinfo.vendor_addr.addr[i] =
-					    (uchar_t)mac;
-					ngep->cur_uni_addr.addr[i] =
-					    (uchar_t)mac;
-					mac >>= 8;
-				}
-			} else {
-				for (i = ETHERADDRL; i-- != 0; ) {
-					ngep->chipinfo.vendor_addr.addr[i] =
-					    (uchar_t)mac;
-					ngep->cur_uni_addr.addr[i] =
-					    (uchar_t)mac;
-					mac >>= 8;
-				}
+		ngep->chipinfo.hw_mac_addr = mac;
+		if (ngep->dev_spec_param.mac_addr_order) {
+			for (i = 0; i < ETHERADDRL; i++) {
+				ngep->chipinfo.vendor_addr.addr[i] =
+				    (uchar_t)mac;
+				ngep->cur_uni_addr.addr[i] =
+				    (uchar_t)mac;
+				mac >>= 8;
+			}
+		} else {
+			for (i = ETHERADDRL; i-- != 0; ) {
+				ngep->chipinfo.vendor_addr.addr[i] =
+				    (uchar_t)mac;
+				ngep->cur_uni_addr.addr[i] =
+				    (uchar_t)mac;
+				mac >>= 8;
 			}
-			ngep->chipinfo.vendor_addr.set = 1;
+		}
+		ngep->chipinfo.vendor_addr.set = 1;
 	}
 	pci_config_put8(ngep->cfg_handle, PCI_CONF_CACHE_LINESZ,
 	    ngep->chipinfo.clsize);
diff --git a/usr/src/uts/common/io/ntxn/unm_gem.c b/usr/src/uts/common/io/ntxn/unm_gem.c
index c08f99d5ab..832a87450b 100644
--- a/usr/src/uts/common/io/ntxn/unm_gem.c
+++ b/usr/src/uts/common/io/ntxn/unm_gem.c
@@ -26,6 +26,11 @@
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/conf.h>
 #include <sys/debug.h>
@@ -1355,7 +1360,7 @@ unmdetach(dev_info_t *dip, ddi_detach_cmd_t cmd)
 	unm_adapter  *adapter = (unm_adapter *)ddi_get_driver_private(dip);
 
 	if (adapter == NULL)
-	return (DDI_FAILURE);
+		return (DDI_FAILURE);
 
 	switch (cmd) {
 	case DDI_DETACH:
diff --git a/usr/src/uts/common/io/ntxn/unm_nic_hw.c b/usr/src/uts/common/io/ntxn/unm_nic_hw.c
index 7a78099ecc..c3f46d0e19 100644
--- a/usr/src/uts/common/io/ntxn/unm_nic_hw.c
+++ b/usr/src/uts/common/io/ntxn/unm_nic_hw.c
@@ -24,6 +24,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/conf.h>
 #include <sys/debug.h>
@@ -1859,10 +1863,10 @@ unm_nic_set_promisc_mode(struct unm_adapter_s *adapter)
 			break;
 	}
 
-if (!ret)
-	adapter->promisc = 1;
+	if (!ret)
+		adapter->promisc = 1;
 
-		return (ret);
+	return (ret);
 }
 
 int
diff --git a/usr/src/uts/common/io/ntxn/unm_nic_init.c b/usr/src/uts/common/io/ntxn/unm_nic_init.c
index ba05e099c8..0ca6b12ff4 100644
--- a/usr/src/uts/common/io/ntxn/unm_nic_init.c
+++ b/usr/src/uts/common/io/ntxn/unm_nic_init.c
@@ -24,6 +24,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/conf.h>
 #include <sys/debug.h>
@@ -67,56 +71,56 @@ static unsigned int crb_addr_xform[MAX_CRB_XFORM];
 static void
 crb_addr_transform_setup(void)
 {
-		crb_addr_transform(XDMA);
-		crb_addr_transform(TIMR);
-		crb_addr_transform(SRE);
-		crb_addr_transform(SQN3);
-		crb_addr_transform(SQN2);
-		crb_addr_transform(SQN1);
-		crb_addr_transform(SQN0);
-		crb_addr_transform(SQS3);
-		crb_addr_transform(SQS2);
-		crb_addr_transform(SQS1);
-		crb_addr_transform(SQS0);
-		crb_addr_transform(RPMX7);
-		crb_addr_transform(RPMX6);
-		crb_addr_transform(RPMX5);
-		crb_addr_transform(RPMX4);
-		crb_addr_transform(RPMX3);
-		crb_addr_transform(RPMX2);
-		crb_addr_transform(RPMX1);
-		crb_addr_transform(RPMX0);
-		crb_addr_transform(ROMUSB);
-		crb_addr_transform(SN);
-		crb_addr_transform(QMN);
-		crb_addr_transform(QMS);
-		crb_addr_transform(PGNI);
-		crb_addr_transform(PGND);
-		crb_addr_transform(PGN3);
-		crb_addr_transform(PGN2);
-		crb_addr_transform(PGN1);
-		crb_addr_transform(PGN0);
-		crb_addr_transform(PGSI);
-		crb_addr_transform(PGSD);
-		crb_addr_transform(PGS3);
-		crb_addr_transform(PGS2);
-		crb_addr_transform(PGS1);
-		crb_addr_transform(PGS0);
-		crb_addr_transform(PS);
-		crb_addr_transform(PH);
-		crb_addr_transform(NIU);
-		crb_addr_transform(I2Q);
-		crb_addr_transform(EG);
-		crb_addr_transform(MN);
-		crb_addr_transform(MS);
-		crb_addr_transform(CAS2);
-		crb_addr_transform(CAS1);
-		crb_addr_transform(CAS0);
-		crb_addr_transform(CAM);
-		crb_addr_transform(C2C1);
-		crb_addr_transform(C2C0);
-		crb_addr_transform(SMB);
-		crb_addr_transform(OCM0);
+	crb_addr_transform(XDMA);
+	crb_addr_transform(TIMR);
+	crb_addr_transform(SRE);
+	crb_addr_transform(SQN3);
+	crb_addr_transform(SQN2);
+	crb_addr_transform(SQN1);
+	crb_addr_transform(SQN0);
+	crb_addr_transform(SQS3);
+	crb_addr_transform(SQS2);
+	crb_addr_transform(SQS1);
+	crb_addr_transform(SQS0);
+	crb_addr_transform(RPMX7);
+	crb_addr_transform(RPMX6);
+	crb_addr_transform(RPMX5);
+	crb_addr_transform(RPMX4);
+	crb_addr_transform(RPMX3);
+	crb_addr_transform(RPMX2);
+	crb_addr_transform(RPMX1);
+	crb_addr_transform(RPMX0);
+	crb_addr_transform(ROMUSB);
+	crb_addr_transform(SN);
+	crb_addr_transform(QMN);
+	crb_addr_transform(QMS);
+	crb_addr_transform(PGNI);
+	crb_addr_transform(PGND);
+	crb_addr_transform(PGN3);
+	crb_addr_transform(PGN2);
+	crb_addr_transform(PGN1);
+	crb_addr_transform(PGN0);
+	crb_addr_transform(PGSI);
+	crb_addr_transform(PGSD);
+	crb_addr_transform(PGS3);
+	crb_addr_transform(PGS2);
+	crb_addr_transform(PGS1);
+	crb_addr_transform(PGS0);
+	crb_addr_transform(PS);
+	crb_addr_transform(PH);
+	crb_addr_transform(NIU);
+	crb_addr_transform(I2Q);
+	crb_addr_transform(EG);
+	crb_addr_transform(MN);
+	crb_addr_transform(MS);
+	crb_addr_transform(CAS2);
+	crb_addr_transform(CAS1);
+	crb_addr_transform(CAS0);
+	crb_addr_transform(CAM);
+	crb_addr_transform(C2C1);
+	crb_addr_transform(C2C0);
+	crb_addr_transform(SMB);
+	crb_addr_transform(OCM0);
 
 	/*
 	 * Used only in P3 just define it for P2 also.
diff --git a/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c b/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c
index b0d07ac1ec..dc9547a275 100644
--- a/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c
+++ b/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c
@@ -22,7 +22,7 @@
 /*
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2016 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2017, Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
  * Copyright 2014 OmniTI Computer Consulting, Inc. All rights reserved.
  * Copyright (c) 2014, Tegile Systems Inc. All rights reserved.
  */
@@ -11958,7 +11958,7 @@ mptsas_diag_register(mptsas_t *mpt, mptsas_fw_diag_register_t *diag_register,
 		mptsas_log(mpt, CE_WARN, "Check of DMA handle failed in "
 		    "mptsas_diag_register.");
 		ddi_fm_service_impact(mpt->m_dip, DDI_SERVICE_UNAFFECTED);
-			status = DDI_FAILURE;
+		status = DDI_FAILURE;
 	}
 
 	/*
diff --git a/usr/src/uts/common/io/skd/skd.c b/usr/src/uts/common/io/skd/skd.c
index e7759e74d7..78753ba00f 100644
--- a/usr/src/uts/common/io/skd/skd.c
+++ b/usr/src/uts/common/io/skd/skd.c
@@ -23,6 +23,7 @@
 /*
  * Copyright 2013 STEC, Inc.  All rights reserved.
  * Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 
 #include	<sys/types.h>
@@ -4775,8 +4776,8 @@ skd_attach(dev_info_t *dip, ddi_attach_cmd_t cmd)
 	}
 	progress |= SKD_REGS_MAPPED;
 
-		skdev->iomap_iobase = skdev->iobase;
-		skdev->iomap_handle = skdev->iobase_handle;
+	skdev->iomap_iobase = skdev->iobase;
+	skdev->iomap_handle = skdev->iobase_handle;
 
 	Dcmn_err(CE_NOTE, "%s: PCI iobase=%ph, iomap=%ph, regnum=%d, "
 	    "regsize=%ld", skdev->name, (void *)skdev->iobase,
diff --git a/usr/src/uts/common/io/tl.c b/usr/src/uts/common/io/tl.c
index 8dd64a4b89..81a0cac18c 100644
--- a/usr/src/uts/common/io/tl.c
+++ b/usr/src/uts/common/io/tl.c
@@ -25,7 +25,7 @@
 /*
  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
- * Copyright (c) 2017, Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 
 /*
@@ -2985,7 +2985,7 @@ tl_conn_req(queue_t *wq, mblk_t *mp)
 		 */
 		(void) (STRLOG(TL_ID, tep->te_minor, 2, SL_TRACE,
 		    "tl_conn_req: qlen overflow connection refused"));
-			err = ECONNREFUSED;
+		err = ECONNREFUSED;
 	}
 
 	/*
diff --git a/usr/src/uts/common/io/urtw/urtw.c b/usr/src/uts/common/io/urtw/urtw.c
index b649ca609d..9f03555479 100644
--- a/usr/src/uts/common/io/urtw/urtw.c
+++ b/usr/src/uts/common/io/urtw/urtw.c
@@ -1,4 +1,8 @@
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -190,7 +194,7 @@ usb_match_device(struct urtw_type *tbl, uint32_t nentries,
 		uint16_t tproduct = tbl[nentries].dev.p;
 		if (tbl[nentries].dev.v == vendor &&
 		    (tproduct == product || tproduct == USB_PRODUCT_ANY))
-		return (&tbl[nentries]);
+			return (&tbl[nentries]);
 	}
 	return (NULL);
 }
diff --git a/usr/src/uts/common/io/usb/clients/hidparser/hidparser.c b/usr/src/uts/common/io/usb/clients/hidparser/hidparser.c
index 3fb1e4ee87..a830ff1c65 100644
--- a/usr/src/uts/common/io/usb/clients/hidparser/hidparser.c
+++ b/usr/src/uts/common/io/usb/clients/hidparser/hidparser.c
@@ -23,6 +23,9 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
 
 #include <sys/usb/usba/usbai_version.h>
 #include <sys/usb/usba.h>
@@ -1642,11 +1645,11 @@ hidparser_ItemList(entity_item_t ** item_ptr, hidparser_tok_t *scan_ifp)
 			curr_ei->prev_coll = cache_ei;
 			cache_ei = curr_ei;
 
-				USB_DPRINTF_L3(PRINT_MASK_ALL,
-				    hparser_log_handle,
-				    "Start Collection:cache_ei = 0x%p,"
-				    " curr_ei = 0x%p",
-				    (void *)cache_ei, (void *)curr_ei);
+			USB_DPRINTF_L3(PRINT_MASK_ALL,
+			    hparser_log_handle,
+			    "Start Collection:cache_ei = 0x%p,"
+			    " curr_ei = 0x%p",
+			    (void *)cache_ei, (void *)curr_ei);
 
 			if (prev_ei == NULL) {
 				prev_ei = curr_ei;
diff --git a/usr/src/uts/common/io/usb/clients/usbinput/usbwcm/usbwcm.c b/usr/src/uts/common/io/usb/clients/usbinput/usbwcm/usbwcm.c
index 253e4862b7..39f2bf252c 100644
--- a/usr/src/uts/common/io/usb/clients/usbinput/usbwcm/usbwcm.c
+++ b/usr/src/uts/common/io/usb/clients/usbinput/usbwcm/usbwcm.c
@@ -1,4 +1,8 @@
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -510,7 +514,7 @@ usbwcm_input_intuos(usbwcm_state_t *usbwcmp, mblk_t *mp)
 		case 0x1:
 		/* Outbound tracking is unreliable on the Cintiq */
 			if (sc->sc_type->protocol == CINTIQ)
-			break;
+				break;
 
 		/* Tool motion */
 		/*FALLTHRU*/
diff --git a/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c b/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c
index c2bae40ba4..6257ec100e 100644
--- a/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c
+++ b/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c
@@ -22,6 +22,9 @@
  * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
 
 /*
  * USB video class driver (usbvc(7D))
@@ -1337,8 +1340,8 @@ usbvc_pwrlvl0(usbvc_state_t *usbvcp)
 	case USB_DEV_ONLINE:
 		/* Deny the powerdown request if the device is busy */
 		if (usbvcp->usbvc_pm->usbvc_pm_busy != 0) {
-		USB_DPRINTF_L2(PRINT_MASK_PM, usbvcp->usbvc_log_handle,
-		    "usbvc_pwrlvl0: usbvc_pm_busy");
+			USB_DPRINTF_L2(PRINT_MASK_PM, usbvcp->usbvc_log_handle,
+			    "usbvc_pwrlvl0: usbvc_pm_busy");
 
 			return (USB_FAILURE);
 		}
diff --git a/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c b/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c
index 7e0e658601..badf500638 100644
--- a/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c
+++ b/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c
@@ -450,7 +450,7 @@ ehci_allocate_pools(ehci_state_t	*ehcip)
 			USB_DPRINTF_L2(PRINT_MASK_ATTA, ehcip->ehci_log_hdl,
 			    "ehci_allocate_pools: More than 1 cookie");
 
-		goto failure;
+			goto failure;
 		}
 	} else {
 		USB_DPRINTF_L4(PRINT_MASK_ATTA, ehcip->ehci_log_hdl,
diff --git a/usr/src/uts/common/io/usb/hcd/openhci/ohci_polled.c b/usr/src/uts/common/io/usb/hcd/openhci/ohci_polled.c
index 5737b9c3e1..717c9f96b1 100644
--- a/usr/src/uts/common/io/usb/hcd/openhci/ohci_polled.c
+++ b/usr/src/uts/common/io/usb/hcd/openhci/ohci_polled.c
@@ -22,6 +22,7 @@
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  * Copyright (c) 2016 by Delphix. All rights reserved.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 
 /*
@@ -1351,7 +1352,8 @@ ohci_polled_restore_state(ohci_polled_t	*ohci_polledp)
 
 		while (td) {
 
-		next_td = ohci_td_iommu_to_cpu(ohcip, Get_TD(td->hctd_next_td));
+			next_td = ohci_td_iommu_to_cpu(ohcip,
+			    Get_TD(td->hctd_next_td));
 
 			/*
 			 * Insert valid interrupt TD back into ED's
diff --git a/usr/src/uts/common/io/usb/usba/hubdi.c b/usr/src/uts/common/io/usb/usba/hubdi.c
index 1cee13edd1..e3f3722de8 100644
--- a/usr/src/uts/common/io/usb/usba/hubdi.c
+++ b/usr/src/uts/common/io/usb/usba/hubdi.c
@@ -22,7 +22,7 @@
  * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2012 Garrett D'Amore <garrett@damore.org>.  All rights reserved.
  * Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
- * Copyright 2016 Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 
 /*
@@ -6799,7 +6799,7 @@ hubd_delete_child(hubd_t *hubd, usb_port_t port, uint_t flag, boolean_t retry)
 			if (hubd->h_children_dips[port] == child_dip) {
 				usba_device_t *ud =
 				    hubd->h_usba_devices[port];
-					hubd->h_children_dips[port] = NULL;
+				hubd->h_children_dips[port] = NULL;
 				if (ud) {
 					mutex_exit(HUBD_MUTEX(hubd));
 
diff --git a/usr/src/uts/common/io/vr/vr.c b/usr/src/uts/common/io/vr/vr.c
index 4447b85622..0ba847bc53 100644
--- a/usr/src/uts/common/io/vr/vr.c
+++ b/usr/src/uts/common/io/vr/vr.c
@@ -24,6 +24,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/stream.h>
 #include <sys/strsun.h>
@@ -1700,7 +1704,7 @@ vr_periodic(void *p)
 					vrp->reset = 1;
 					vr_log(vrp, CE_WARN,
 					    "TX stalled, resetting MAC");
-				vrp->stats.txstalls++;
+					vrp->stats.txstalls++;
 				} else {
 					/*
 					 * Increase until we find that we've
@@ -3390,9 +3394,9 @@ vr_mac_propinfo(void *arg, const char *pr_name, mac_prop_id_t pr_num,
 
 		default:
 			return;
-		}
+	}
 
-		mac_prop_info_set_default_uint8(prh, val);
+	mac_prop_info_set_default_uint8(prh, val);
 }
 
 /*
diff --git a/usr/src/uts/common/krtld/kobj.c b/usr/src/uts/common/krtld/kobj.c
index 3391abd745..4f8997adfc 100644
--- a/usr/src/uts/common/krtld/kobj.c
+++ b/usr/src/uts/common/krtld/kobj.c
@@ -25,7 +25,7 @@
 /*
  * Copyright 2011 Bayard G. Bell <buffer.g.overflow@gmail.com>.
  * All rights reserved. Use is subject to license terms.
- * Copyright (c) 2017 Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 
 /*
@@ -3393,26 +3393,26 @@ sym_insert(struct module *mp, char *name, symid_t index)
 	symid_t *ip;
 
 #ifdef KOBJ_DEBUG
-		if (kobj_debug & D_SYMBOLS) {
-			static struct module *lastmp = NULL;
-			Sym *sp;
-			if (lastmp != mp) {
-				_kobj_printf(ops,
-				    "krtld: symbol entry: file=%s\n",
-				    mp->filename);
-				_kobj_printf(ops,
-				    "krtld:\tsymndx\tvalue\t\t"
-				    "symbol name\n");
-				lastmp = mp;
-			}
-			sp = (Sym *)(mp->symtbl +
-			    index * mp->symhdr->sh_entsize);
-			_kobj_printf(ops, "krtld:\t[%3d]", index);
-			_kobj_printf(ops, "\t0x%lx", sp->st_value);
-			_kobj_printf(ops, "\t%s\n", name);
+	if (kobj_debug & D_SYMBOLS) {
+		static struct module *lastmp = NULL;
+		Sym *sp;
+		if (lastmp != mp) {
+			_kobj_printf(ops,
+			    "krtld: symbol entry: file=%s\n",
+			    mp->filename);
+			_kobj_printf(ops,
+			    "krtld:\tsymndx\tvalue\t\t"
+			    "symbol name\n");
+			lastmp = mp;
 		}
-
+		sp = (Sym *)(mp->symtbl +
+		    index * mp->symhdr->sh_entsize);
+		_kobj_printf(ops, "krtld:\t[%3d]", index);
+		_kobj_printf(ops, "\t0x%lx", sp->st_value);
+		_kobj_printf(ops, "\t%s\n", name);
+	}
 #endif
+
 	for (ip = &mp->buckets[kobj_hash_name(name) % mp->hashsize]; *ip;
 	    ip = &mp->chains[*ip]) {
 		;
diff --git a/usr/src/uts/common/os/aio.c b/usr/src/uts/common/os/aio.c
index cc53f43911..35e0a4dd63 100644
--- a/usr/src/uts/common/os/aio.c
+++ b/usr/src/uts/common/os/aio.c
@@ -25,6 +25,10 @@
  */
 
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * Kernel asynchronous I/O.
  * This is only for raw devices now (as of Nov. 1993).
  */
@@ -304,7 +308,7 @@ kaio(
 	offset_t	off;
 
 
-		rvp->r_vals = 0;
+	rvp->r_vals = 0;
 #if defined(_LITTLE_ENDIAN)
 	off = ((u_offset_t)uap[5] << 32) | (u_offset_t)uap[4];
 #else
diff --git a/usr/src/uts/common/os/modconf.c b/usr/src/uts/common/os/modconf.c
index 2aac71e0fc..54272275e2 100644
--- a/usr/src/uts/common/os/modconf.c
+++ b/usr/src/uts/common/os/modconf.c
@@ -23,6 +23,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/param.h>
@@ -1336,7 +1340,7 @@ mod_installexec(struct modlexec *modl, struct modlinkage *modlp)
 	if (eswp->exec_func != NULL) {
 		printf("exec type %x is already installed\n",
 		    *eswp->exec_magic);
-			return (EBUSY);		 /* it's already there! */
+		return (EBUSY);		 /* it's already there! */
 	}
 
 	rw_enter(eswp->exec_lock, RW_WRITER);
diff --git a/usr/src/uts/common/os/streamio.c b/usr/src/uts/common/os/streamio.c
index 8ec67ea76a..1f9ceee188 100644
--- a/usr/src/uts/common/os/streamio.c
+++ b/usr/src/uts/common/os/streamio.c
@@ -2077,11 +2077,11 @@ strrput_nondata(queue_t *q, mblk_t *bp)
 					 * messages after it has done a
 					 * qprocsoff.
 					 */
-				if (_OTHERQ(q)->q_next == NULL)
-					freemsg(bp);
-				else
-					qreply(q, bp);
-				return (0);
+					if (_OTHERQ(q)->q_next == NULL)
+						freemsg(bp);
+					else
+						qreply(q, bp);
+					return (0);
 				}
 		}
 		freemsg(bp);
diff --git a/usr/src/uts/common/rpc/sec/authdesubr.c b/usr/src/uts/common/rpc/sec/authdesubr.c
index b4264b98e4..df71d0a491 100644
--- a/usr/src/uts/common/rpc/sec/authdesubr.c
+++ b/usr/src/uts/common/rpc/sec/authdesubr.c
@@ -23,6 +23,7 @@
  * Copyright 2014 Gary Mills
  * Copyright 2001 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 
 /*	Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T	*/
@@ -307,7 +308,7 @@ again:
 					mp2 = mp2->b_cont;
 				}
 
-			freemsg(mp);
+				freemsg(mp);
 			}
 
 			thetime = (time_t)dummy;
diff --git a/usr/src/uts/common/rpc/sec_gss/rpcsec_gss.c b/usr/src/uts/common/rpc/sec_gss/rpcsec_gss.c
index 42808c8552..5d1f8fb8c5 100644
--- a/usr/src/uts/common/rpc/sec_gss/rpcsec_gss.c
+++ b/usr/src/uts/common/rpc/sec_gss/rpcsec_gss.c
@@ -24,6 +24,10 @@
  */
 
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved.
  *
  * $Header:
@@ -277,9 +281,9 @@ rpc_gss_secget(CLIENT *clnt,
 	NOT_NULL(cr);
 	IS_ALIGNED(cr);
 #ifdef DEBUG
-if (HASH(cache_key, uid) < 0) {
-	prom_printf("cache_key %p, cr %p\n", cache_key, (void *)cr);
-}
+	if (HASH(cache_key, uid) < 0) {
+		prom_printf("cache_key %p, cr %p\n", cache_key, (void *)cr);
+	}
 #endif
 
 	/*
diff --git a/usr/src/uts/common/vm/vm_seg.c b/usr/src/uts/common/vm/vm_seg.c
index 14076ddff8..2c4d09fc03 100644
--- a/usr/src/uts/common/vm/vm_seg.c
+++ b/usr/src/uts/common/vm/vm_seg.c
@@ -21,7 +21,7 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
- * Copyright (c) 2015, Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -1831,7 +1831,7 @@ seg_can_change_zones(struct seg *seg)
 		if (svd->type == MAP_SHARED &&
 		    svd->amp != NULL &&
 		    svd->amp->swresv > 0)
-		return (B_FALSE);
+			return (B_FALSE);
 	}
 	return (B_TRUE);
 }
diff --git a/usr/src/uts/i86pc/cpu/generic_cpu/gcpu_main.c b/usr/src/uts/i86pc/cpu/generic_cpu/gcpu_main.c
index 18462971fb..66230b3d7b 100644
--- a/usr/src/uts/i86pc/cpu/generic_cpu/gcpu_main.c
+++ b/usr/src/uts/i86pc/cpu/generic_cpu/gcpu_main.c
@@ -30,6 +30,10 @@
  */
 
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * Generic x86 CPU Module
  *
  * This CPU module is used for generic x86 CPUs when Solaris has no other
@@ -279,11 +283,11 @@ gcpu_post_mpstartup(cmi_hdl_t hdl)
 	cms_post_mpstartup(hdl);
 
 #ifndef __xpv
-		/*
-		 * All cpu handles are initialized only once all cpus
-		 * are started, so we can begin polling post mp startup.
-		 */
-		gcpu_mca_poll_start(hdl);
+	/*
+	 * All cpu handles are initialized only once all cpus are started, so we
+	 * can begin polling post mp startup.
+	 */
+	gcpu_mca_poll_start(hdl);
 #endif
 }
 
diff --git a/usr/src/uts/i86pc/io/mp_platform_common.c b/usr/src/uts/i86pc/io/mp_platform_common.c
index 241171bd8e..d26c83f8ce 100644
--- a/usr/src/uts/i86pc/io/mp_platform_common.c
+++ b/usr/src/uts/i86pc/io/mp_platform_common.c
@@ -23,7 +23,7 @@
  * Copyright 2016 Nexenta Systems, Inc.
  * Copyright 2017 Joyent, Inc.
  * Copyright (c) 2017 by Delphix. All rights reserved.
- * Copyright 2017 Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 /*
  * Copyright (c) 2010, Intel Corporation.
@@ -1387,14 +1387,14 @@ apic_handle_pci_pci_bridge(dev_info_t *idip, int child_devno, int child_ipin,
 			 * found or the root is reached.
 			 */
 			ipin = (child_devno + child_ipin) % PCI_INTD;
-				if (bridge_bus == 0 && apic_pci_bus_total == 1)
-					bridge_bus = (int)apic_single_pci_busid;
-				pci_irq = ((bridge_devno & 0x1f) << 2) |
-				    (ipin & 0x3);
-				if ((*intrp = apic_find_io_intr_w_busid(pci_irq,
-				    bridge_bus)) != NULL) {
-					return (pci_irq);
-				}
+			if (bridge_bus == 0 && apic_pci_bus_total == 1)
+				bridge_bus = (int)apic_single_pci_busid;
+			pci_irq = ((bridge_devno & 0x1f) << 2) |
+			    (ipin & 0x3);
+			if ((*intrp = apic_find_io_intr_w_busid(pci_irq,
+			    bridge_bus)) != NULL) {
+				return (pci_irq);
+			}
 			dip = dipp;
 			child_devno = bridge_devno;
 			child_ipin = ipin;
diff --git a/usr/src/uts/i86pc/io/mp_platform_misc.c b/usr/src/uts/i86pc/io/mp_platform_misc.c
index b232bd5eb8..b51e7992ee 100644
--- a/usr/src/uts/i86pc/io/mp_platform_misc.c
+++ b/usr/src/uts/i86pc/io/mp_platform_misc.c
@@ -28,6 +28,10 @@
  */
 
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * PSMI 1.1 extensions are supported only in 2.6 and later versions.
  * PSMI 1.2 extensions are supported only in 2.7 and later versions.
  * PSMI 1.3 and 1.4 extensions are supported in Solaris 10.
@@ -1897,8 +1901,8 @@ apic_check_stuck_interrupt(apic_irq_t *irq_ptr, int old_bind_cpu,
 	    (reps < apic_max_reps_clear_pending));
 
 #ifdef DEBUG
-		if (rdt_entry & AV_PENDING)
-			apic_intr_deliver_timeouts++;
+	if (rdt_entry & AV_PENDING)
+		apic_intr_deliver_timeouts++;
 #endif
 
 	/*
diff --git a/usr/src/uts/i86pc/os/cms.c b/usr/src/uts/i86pc/os/cms.c
index dd32416535..0433aeabfd 100644
--- a/usr/src/uts/i86pc/os/cms.c
+++ b/usr/src/uts/i86pc/os/cms.c
@@ -28,6 +28,10 @@
  * All rights reserved.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/cpu_module_ms_impl.h>
 #include <sys/cpuvar.h>
@@ -224,7 +228,7 @@ cms_load_modctl(modctl_t *modp)
 		    "version %d, kernel requires API version %d",
 		    modp->mod_modname, CMS_API_VERSION_TOPRINT(apiver),
 		    CMS_API_VERSION_TOPRINT(CMS_API_VERSION));
-	return (NULL);
+		return (NULL);
 	}
 
 	if ((ops = cms_getops(modp)) == NULL)
diff --git a/usr/src/uts/intel/io/dktp/disk/cmdk.c b/usr/src/uts/intel/io/dktp/disk/cmdk.c
index a3989f5746..628b0a60af 100644
--- a/usr/src/uts/intel/io/dktp/disk/cmdk.c
+++ b/usr/src/uts/intel/io/dktp/disk/cmdk.c
@@ -23,6 +23,10 @@
  * Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/scsi/scsi.h>
 #include <sys/dktp/cm.h>
 #include <sys/dktp/quetypes.h>
@@ -826,7 +830,7 @@ rwcmd_copyout(struct dadkio_rwcmd *rwcmdp, caddr_t outaddr, int flag)
 		case DDI_MODEL_NONE: {
 			if (ddi_copyout(rwcmdp, outaddr,
 			    sizeof (struct dadkio_rwcmd), flag))
-			return (EFAULT);
+				return (EFAULT);
 		}
 	}
 	return (0);
diff --git a/usr/src/uts/intel/io/drm/radeon_state.c b/usr/src/uts/intel/io/drm/radeon_state.c
index 9323215254..2afd9ebf95 100644
--- a/usr/src/uts/intel/io/drm/radeon_state.c
+++ b/usr/src/uts/intel/io/drm/radeon_state.c
@@ -3,6 +3,10 @@
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 /* radeon_state.c -- State support for Radeon -*- linux-c -*- */
 /*
  * Copyright 2000 VA Linux Systems, Inc., Fremont, California.
@@ -32,8 +36,6 @@
  *    Kevin E. Martin <martin@valinux.com>
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "drmP.h"
 #include "drm.h"
 #include "drm_sarea.h"
@@ -2244,7 +2246,7 @@ static int radeon_cp_clear(DRM_IOCTL_ARGS)
 
 	if (DRM_COPY_FROM_USER(&depth_boxes, clear.depth_boxes,
 	    sarea_priv->nbox * sizeof (depth_boxes[0])))
-	return (EFAULT);
+		return (EFAULT);
 
 	radeon_cp_dispatch_clear(dev, &clear, depth_boxes);
 
@@ -2924,10 +2926,10 @@ radeon_emit_veclinear(drm_radeon_private_t *dev_priv,
 	int start = header.veclinear.addr_lo | (header.veclinear.addr_hi << 8);
 	RING_LOCALS;
 
-		if (!sz)
-			return (0);
-		if (sz * 4 > cmdbuf->bufsz)
-			return (EINVAL);
+	if (!sz)
+		return (0);
+	if (sz * 4 > cmdbuf->bufsz)
+		return (EINVAL);
 
 	BEGIN_RING(5 + sz);
 	OUT_RING_REG(RADEON_SE_TCL_STATE_FLUSH, 0);
diff --git a/usr/src/uts/intel/io/intel_nhm/intel_nhmdrv.c b/usr/src/uts/intel/io/intel_nhm/intel_nhmdrv.c
index c5b79857c3..281bbf410b 100644
--- a/usr/src/uts/intel/io/intel_nhm/intel_nhmdrv.c
+++ b/usr/src/uts/intel/io/intel_nhm/intel_nhmdrv.c
@@ -24,6 +24,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/nvpair.h>
@@ -82,8 +86,8 @@ inhm_mc_snapshot_destroy()
 			continue;
 
 		kmem_free(inhm_mc_snapshot[i], inhm_mc_snapshotsz[i]);
-			inhm_mc_snapshot[i] = NULL;
-			inhm_mc_snapshotsz[i] = 0;
+		inhm_mc_snapshot[i] = NULL;
+		inhm_mc_snapshotsz[i] = 0;
 	}
 	inhm_mc_snapshotgen++;
 }
author	Jerry Jelinek <jerry.jelinek@joyent.com>	2019-01-15 13:04:31 +0000
committer	Jerry Jelinek <jerry.jelinek@joyent.com>	2019-01-15 13:04:31 +0000
commit	7a34fde236609b18147eb73e6a163e19162d96e2 (patch)
tree	11d647767f5036bbcccee110ad13891ed603a972
parent	0de99a4637b946f1cd1c7d9fb5949112e1afb82f (diff)
parent	c653bb4713ca694c2d16b04b65d5b76c0bb46bd4 (diff)
download	illumos-joyent-7a34fde236609b18147eb73e6a163e19162d96e2.tar.gz