[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

8 files changed, 30 insertions, 5 deletions

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