[illumos-gate merge]

commit ca783257c986cddcc674ae22916a6766b98a2d36
    5513 KM_NORMALPRI should be documented in kmem_alloc(9f) and kmem_cache_create(9f) man pages
    14465 Present KM_NOSLEEP_LAZY as documented interface
commit 36589d6bb0cdae89e166b57b0d64ae56d53247d9
    13500 Want support for overlay networks
commit 68df0c4f60a2e57680d6d1e6dba32ffa2d035538
    14513 nvmeadm list-firmware
commit 8466ab889653be2119e4a8966b6bc4e2d5ee2fb6
    14507 nvmeadm shouldn't allow writing firmware to a read-only slot 1
    14508 improve nvmeadm firmware reporting
    14509 nvmeadm commit-firmware error reporting isn't working as intended
commit 1fa2a66491e7d8ae0be84e7da4da8e812480c710
    14249 pseudo-terminal nomenclature should reflect POSIX

Conflicts:
    usr/src/cmd/cmd-inet/etc/services
    usr/src/cmd/dladm/Makefile
    usr/src/cmd/dladm/dladm.c
    usr/src/cmd/varpd/Makefile
    usr/src/cmd/varpd/varpd.c
    usr/src/cmd/zoneadmd/zcons.c
    usr/src/lib/Makefile
    usr/src/lib/libdladm/Makefile
    usr/src/lib/libdladm/common/libdladm.c
    usr/src/lib/libdladm/common/libdladm.h
    usr/src/lib/libdladm/common/libdladm_impl.h
    usr/src/lib/libdladm/common/libdloverlay.c
    usr/src/lib/libdladm/common/libdlvnic.c
    usr/src/lib/varpd/Makefile
    usr/src/lib/varpd/direct/Makefile.com
    usr/src/lib/varpd/direct/amd64/Makefile
    usr/src/lib/varpd/direct/common/libvarpd_direct.c
    usr/src/lib/varpd/direct/i386/Makefile
    usr/src/lib/varpd/files/Makefile
    usr/src/lib/varpd/files/Makefile.com
    usr/src/lib/varpd/files/amd64/Makefile
    usr/src/lib/varpd/files/common/libvarpd_files.c
    usr/src/lib/varpd/files/i386/Makefile
    usr/src/lib/varpd/libvarpd/Makefile
    usr/src/lib/varpd/libvarpd/Makefile.com
    usr/src/lib/varpd/libvarpd/amd64/Makefile
    usr/src/lib/varpd/libvarpd/common/libvarpd.c
    usr/src/lib/varpd/libvarpd/common/libvarpd_arp.c
    usr/src/lib/varpd/libvarpd/common/libvarpd_client.c
    usr/src/lib/varpd/libvarpd/common/libvarpd_impl.h
    usr/src/lib/varpd/libvarpd/common/libvarpd_overlay.c
    usr/src/lib/varpd/libvarpd/common/libvarpd_panic.c
    usr/src/lib/varpd/libvarpd/common/libvarpd_plugin.c
    usr/src/lib/varpd/libvarpd/common/libvarpd_provider.h
    usr/src/lib/varpd/libvarpd/common/libvarpd_util.c
    usr/src/lib/varpd/libvarpd/i386/Makefile
    usr/src/man/man1m/dladm.1m
    usr/src/man/man5/overlay.5
    usr/src/man/man7p/Makefile
    usr/src/man/man7p/vxlan.7p
    usr/src/uts/Makefile.uts
    usr/src/uts/common/Makefile.files
    usr/src/uts/common/io/overlay/overlay.c
    usr/src/uts/common/io/overlay/overlay_mux.c
    usr/src/uts/common/io/overlay/overlay_target.c
    usr/src/uts/common/sys/dls_mgmt.h
    usr/src/uts/common/sys/mac_provider.h
    usr/src/uts/common/sys/overlay_common.h
    usr/src/uts/common/sys/overlay_impl.h
    usr/src/uts/common/sys/overlay_plugin.h
    usr/src/uts/common/sys/overlay_target.h

17 files changed, 150 insertions, 160 deletions

diff --git a/usr/src/lib/varpd/direct/Makefile.com b/usr/src/lib/varpd/direct/Makefile.com
index 2987d2a260..9d62140620 100644
--- a/usr/src/lib/varpd/direct/Makefile.com
+++ b/usr/src/lib/varpd/direct/Makefile.com
@@ -24,8 +24,7 @@ LIBS =		$(DYNLIB)
 LDLIBS +=	-lc -lumem -lnvpair
 CPPFLAGS +=	-I../common
 
-C99MODE=	-xc99=%all
-C99LMODE=	-Xc99=%all
+CSTD=		$(CSTD_GNU99)
 
 SRCDIR =	../common
 
diff --git a/usr/src/lib/varpd/direct/amd64/Makefile b/usr/src/lib/varpd/direct/amd64/Makefile
index d552642882..1881990d79 100644
--- a/usr/src/lib/varpd/direct/amd64/Makefile
+++ b/usr/src/lib/varpd/direct/amd64/Makefile
@@ -16,4 +16,4 @@
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/varpd/direct/common/libvarpd_direct.c b/usr/src/lib/varpd/direct/common/libvarpd_direct.c
index 018cdf641c..ed9f79fc7f 100644
--- a/usr/src/lib/varpd/direct/common/libvarpd_direct.c
+++ b/usr/src/lib/varpd/direct/common/libvarpd_direct.c
@@ -19,7 +19,7 @@
  * This plugin implements a simple point to point plugin for a packet. It
  * represents the traditional tunnel, just in overlay form. As such, the only
  * properties it needs are those to determine where to send everything. At this
- * time, we don't allow a mulicast address; however, there's no reason that the
+ * time, we don't allow a multicast address; however, there's no reason that the
  * direct plugin shouldn't in theory support multicast, though when implementing
  * it the best path will become clear.
  *
@@ -48,7 +48,7 @@ typedef struct varpd_direct {
 	mutex_t			vad_lock;	/* Protects the rest */
 	boolean_t		vad_hip;
 	boolean_t		vad_hport;
-	struct in6_addr 	vad_ip;
+	struct in6_addr		vad_ip;
 	uint16_t		vad_port;
 } varpd_direct_t;
 
diff --git a/usr/src/lib/varpd/direct/i386/Makefile b/usr/src/lib/varpd/direct/i386/Makefile
index f2b4f63da5..4398507523 100644
--- a/usr/src/lib/varpd/direct/i386/Makefile
+++ b/usr/src/lib/varpd/direct/i386/Makefile
@@ -15,4 +15,4 @@
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/varpd/files/Makefile.com b/usr/src/lib/varpd/files/Makefile.com
index 815f883ea2..dc24395673 100644
--- a/usr/src/lib/varpd/files/Makefile.com
+++ b/usr/src/lib/varpd/files/Makefile.com
@@ -25,11 +25,7 @@ LIBS =		$(DYNLIB)
 LDLIBS +=	-lc -lumem -lnvpair -lsocket -lcustr
 CPPFLAGS +=	-I../common
 
-LINTFLAGS +=	-erroff=E_BAD_PTR_CAST_ALIGN
-LINTFLAGS64 +=	-erroff=E_BAD_PTR_CAST_ALIGN
-
-C99MODE=	-xc99=%all
-C99LMODE=	-Xc99=%all
+CSTD=		$(CSTD_GNU99)
 
 SRCDIR =	../common
 
diff --git a/usr/src/lib/varpd/files/amd64/Makefile b/usr/src/lib/varpd/files/amd64/Makefile
index d552642882..1881990d79 100644
--- a/usr/src/lib/varpd/files/amd64/Makefile
+++ b/usr/src/lib/varpd/files/amd64/Makefile
@@ -16,4 +16,4 @@
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/varpd/files/common/libvarpd_files.c b/usr/src/lib/varpd/files/common/libvarpd_files.c
index 812919a07d..84cb27f9e8 100644
--- a/usr/src/lib/varpd/files/common/libvarpd_files.c
+++ b/usr/src/lib/varpd/files/common/libvarpd_files.c
@@ -17,7 +17,7 @@
  * Files based plug-in for varpd
  *
  * This is a dynamic varpd plug-in that has a static backing store. It's really
- * nothing more than a glorified version of /etc/ethers, though it facilitiates
+ * nothing more than a glorified version of /etc/ethers, though it facilitates
  * a bit more. The files module allows for the full set of mappings to be fixed
  * at creation time. In addition, it also provides support for proxying ARP,
  * NDP, and DHCP.
@@ -28,7 +28,7 @@
  * The plug-in only has a single property, which is the location of the JSON
  * file. The JSON file itself looks something like:
  *
- * 	{
+ *	{
  *		"aa:bb:cc:dd:ee:ff": {
  *			"arp": "10.23.69.1",
  *			"ndp": "2600:3c00::f03c:91ff:fe96:a264",
diff --git a/usr/src/lib/varpd/files/i386/Makefile b/usr/src/lib/varpd/files/i386/Makefile
index f2b4f63da5..4398507523 100644
--- a/usr/src/lib/varpd/files/i386/Makefile
+++ b/usr/src/lib/varpd/files/i386/Makefile
@@ -15,4 +15,4 @@
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/varpd/libvarpd/Makefile.com b/usr/src/lib/varpd/libvarpd/Makefile.com
index 67f824f7b2..efb86887e9 100644
--- a/usr/src/lib/varpd/libvarpd/Makefile.com
+++ b/usr/src/lib/varpd/libvarpd/Makefile.com
@@ -28,6 +28,9 @@ OBJECTS =	libvarpd.o \
 
 include ../../../Makefile.lib
 
+# install this library in the root filesystem
+include ../../../Makefile.rootfs
+
 LIBS =		$(DYNLIB)
 LDLIBS +=	-lc -lavl -lumem -lidspace -lnvpair -lmd5 -lrename \
 		-lbunyan
@@ -35,8 +38,7 @@ CPPFLAGS +=	-I../common
 
 CERRWARN +=	-erroff=E_STRUCT_DERIVED_FROM_FLEX_MBR
 
-C99MODE=	-xc99=%all
-C99LMODE=	-Xc99=%all
+CSTD=		$(CSTD_GNU99)
 
 SRCDIR =	../common
 
diff --git a/usr/src/lib/varpd/libvarpd/amd64/Makefile b/usr/src/lib/varpd/libvarpd/amd64/Makefile
index d552642882..1881990d79 100644
--- a/usr/src/lib/varpd/libvarpd/amd64/Makefile
+++ b/usr/src/lib/varpd/libvarpd/amd64/Makefile
@@ -16,4 +16,4 @@
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/varpd/libvarpd/common/libvarpd_arp.c b/usr/src/lib/varpd/libvarpd/common/libvarpd_arp.c
index df69207fe0..7180fcb2de 100644
--- a/usr/src/lib/varpd/libvarpd/common/libvarpd_arp.c
+++ b/usr/src/lib/varpd/libvarpd/common/libvarpd_arp.c
@@ -14,7 +14,7 @@
  */
 
 /*
- * Common routines for implmeenting proxy arp
+ * Common routines for implementing proxy arp
  */
 
 #include <sys/types.h>
@@ -43,7 +43,7 @@ typedef struct varpd_arp_query {
 	varpd_query_handle_t		*vaq_query;
 	const overlay_targ_lookup_t	*vaq_otl;
 	ip6_t				*vaq_ip6;
-	nd_neighbor_solicit_t 		*vaq_ns;
+	nd_neighbor_solicit_t		*vaq_ns;
 } varpd_arp_query_t;
 
 typedef struct varpd_dhcp_query {
@@ -320,7 +320,7 @@ libvarpd_plugin_proxy_ndp(varpd_provider_handle_t *hdl,
 	}
 
 	/*
-	 * Now we know that this is an ICMPv6 request targetting the right
+	 * Now we know that this is an ICMPv6 request targeting the right
 	 * IPv6 multicast prefix. Let's go through and verify that ICMPv6
 	 * indicates that we have the real thing and ensure that per RFC 4861
 	 * the target address is not a multicast address. Further, because this
@@ -422,7 +422,6 @@ libvarpd_proxy_ndp_fini(varpd_arp_query_t *vaq)
 	na->nd_na_code = 0;
 	/*
 	 * RFC 4443 defines that we should set the checksum to zero before we
-	 * calculate the checksumat we should set the checksum to zero before we
 	 * calculate it.
 	 */
 	na->nd_na_cksum = 0;
@@ -605,7 +604,7 @@ libvarpd_plugin_dhcp_reply(varpd_dhcp_handle_t *vdh, int action)
 }
 
 /*
- * Inject a gratuitious ARP packet to the specified mac address.
+ * Inject a gratuitous ARP packet to the specified mac address.
  */
 void
 libvarpd_inject_arp(varpd_provider_handle_t *vph, const uint16_t vlan,
diff --git a/usr/src/lib/varpd/libvarpd/common/libvarpd_client.c b/usr/src/lib/varpd/libvarpd/common/libvarpd_client.c
index 18e220259c..1254c14e19 100644
--- a/usr/src/lib/varpd/libvarpd/common/libvarpd_client.c
+++ b/usr/src/lib/varpd/libvarpd/common/libvarpd_client.c
@@ -76,7 +76,7 @@ libvarpd_c_door_call(varpd_client_t *client, varpd_client_arg_t *argp,
 		case ENOTSUP:
 		case EOVERFLOW:
 		case ENFILE:
-			libvarpd_panic("unhandalable errno from door_call: %d",
+			libvarpd_panic("unhandleable errno from door_call: %d",
 			    errno);
 		}
 		ret = errno;
diff --git a/usr/src/lib/varpd/libvarpd/common/libvarpd_overlay.c b/usr/src/lib/varpd/libvarpd/common/libvarpd_overlay.c
index cedd58dad9..f314440056 100644
--- a/usr/src/lib/varpd/libvarpd/common/libvarpd_overlay.c
+++ b/usr/src/lib/varpd/libvarpd/common/libvarpd_overlay.c
@@ -232,11 +232,11 @@ libvarpd_overlay_lookup_reply(varpd_impl_t *vip,
 
 	/*
 	 * The only errors that should cause us to end up here are due to
-	 * programmer errors. Aruably the EINAVL case indicates that something
+	 * programmer errors. Arguably the EINVAL case indicates that something
 	 * is a bit off; however, at this time we don't opt to kill varpd.
 	 */
 	if (ret != 0 && errno != EINVAL)
-		libvarpd_panic("receieved bad errno from lookup_reply "
+		libvarpd_panic("received bad errno from lookup_reply "
 		    "(cmd %d): %d\n", cmd, errno);
 }
 
@@ -504,7 +504,7 @@ libvarpd_plugin_query_reply(varpd_query_handle_t *vqh, int action)
 	varpd_query_t *vqp = (varpd_query_t *)vqh;
 
 	if (vqp == NULL)
-		libvarpd_panic("unkonwn plugin passed invalid "
+		libvarpd_panic("unknown plugin passed invalid "
 		    "varpd_query_handle_t");
 
 	if (action == VARPD_LOOKUP_DROP)
diff --git a/usr/src/lib/varpd/libvarpd/common/libvarpd_panic.c b/usr/src/lib/varpd/libvarpd/common/libvarpd_panic.c
index 6728d79d6e..ba6bc26bf6 100644
--- a/usr/src/lib/varpd/libvarpd/common/libvarpd_panic.c
+++ b/usr/src/lib/varpd/libvarpd/common/libvarpd_panic.c
@@ -15,7 +15,7 @@
 
 /*
  * No, 'tis not so deep as a well, nor so wide as a church door; but 'tis
- * enough,'twill serve. Ask for me tomorrow, and you shall find me a grave man.
+ * enough, 'twill serve. Ask for me tomorrow, and you shall find me a grave man.
  *
  * This file maintains various routines for handling when we die.
  */
diff --git a/usr/src/lib/varpd/libvarpd/common/libvarpd_provider.h b/usr/src/lib/varpd/libvarpd/common/libvarpd_provider.h
index 64fa99d308..17ea02fe03 100644
--- a/usr/src/lib/varpd/libvarpd/common/libvarpd_provider.h
+++ b/usr/src/lib/varpd/libvarpd/common/libvarpd_provider.h
@@ -86,158 +86,158 @@
  *
  *   varpd_plugin_create_f
  *
- *   	Create a new instance of a plugin. Each instance refers to a different
- *   	overlay device and thus a different overlay identifier. Each instance
- *   	has its own property space and is unique. This function gives the chance
- *   	for the plugin to create and provide any private data that it will
- *   	require.
+ *	Create a new instance of a plugin. Each instance refers to a different
+ *	overlay device and thus a different overlay identifier. Each instance
+ *	has its own property space and is unique. This function gives the chance
+ *	for the plugin to create and provide any private data that it will
+ *	require.
  *
- *   	In addition, the plugin is given the type of destination that is
- *   	required and it is its job to determine whether or not it supports it.
+ *	In addition, the plugin is given the type of destination that is
+ *	required and it is its job to determine whether or not it supports it.
  *
- *   varpd_plugin_destory_f
+ *   varpd_plugin_destroy_f
  *
- *   	This is the opposite of varpd_plugin_create_f. It is called to allow the
- *   	plugin to reclaim any resources with the private argument that it passed
- *   	out as part of the destroy function.
+ *	This is the opposite of varpd_plugin_create_f. It is called to allow the
+ *	plugin to reclaim any resources with the private argument that it passed
+ *	out as part of the destroy function.
  *
  *   varpd_plugin_start_f
  *
- *   	This routine is called to indicate that an instance should be started.
- *   	This is a plugin's chance to verify that it has all of its required
- *   	properties set and to take care of any action that needs to be handled
- *   	to begin the plugin. After this point it will be legal to have the
- *   	varpd_plugin_default_f, varpd_plugin_lookup_f, varpd_plugin_arp_f and
- *   	varpd_plugin_dhcp_f endpoints called.
+ *	This routine is called to indicate that an instance should be started.
+ *	This is a plugin's chance to verify that it has all of its required
+ *	properties set and to take care of any action that needs to be handled
+ *	to begin the plugin. After this point it will be legal to have the
+ *	varpd_plugin_default_f, varpd_plugin_lookup_f, varpd_plugin_arp_f and
+ *	varpd_plugin_dhcp_f endpoints called.
  *
  *   varpd_plugin_stop_f
  *
- *   	This routine is called to indicate that an instance is stopping, it is
- *   	the opposite of varpd_plugin_start_f. This is a chance to clean up
- *   	resources that are a side effect of having started the instance.
+ *	This routine is called to indicate that an instance is stopping, it is
+ *	the opposite of varpd_plugin_start_f. This is a chance to clean up
+ *	resources that are a side effect of having started the instance.
  *
  *   varpd_plugin_default_f
  *
- *   	This routine is defined by plugins of type OVERLAY_TARGET_POINT. It is
- *   	used to answer the question of where should all traffic for this
- *   	instance be destined. Plugins of type OVERLAY_TARGET_DYNAMIC should
- *   	leave this entry set to NULL.
+ *	This routine is defined by plugins of type OVERLAY_TARGET_POINT. It is
+ *	used to answer the question of where should all traffic for this
+ *	instance be destined. Plugins of type OVERLAY_TARGET_DYNAMIC should
+ *	leave this entry set to NULL.
  *
- *   	On success, the default routine should return VARPD_LOOKUP_OK. On
- *   	failure, it should return the macro VARPD_LOOKUP_DROP.
+ *	On success, the default routine should return VARPD_LOOKUP_OK. On
+ *	failure, it should return the macro VARPD_LOOKUP_DROP.
  *
  *   varpd_plugin_lookup_f
  *
- *   	This routine must be defined by plugins of type OVERLAY_TARGET_DYNAMIC.
- *   	It is used to lookup the destination for a given request. Each request
- *   	comes in with its own MAC address this allows a plugin to direct it to
- *   	any remote location.
- *
- *   	This is designed as an asynchronous API. Once a lookup is completed it
- *   	should call libvarpd_plugin_query_reply() and pass as the second
- *   	argument either VARPD_LOOKUP_OK to indicate that it went alright or it
- *   	should reply VARPD_LOOKUP_DROP to indicate that the packet should be
- *   	dropped.
- *
- *   	In addition, there are several utility routines that can take care of
- *   	various kinds of traffic automatically. For example, if an ARP, NDP, or
- *   	DHCP packet comes in, there are utilities such as
- *   	libvarpd_plugin_proxy_arp(), libvarpd_plugin_proxy_ndp() and
- *   	libvarpd_plugin_proxy_dhcp(), which allows the system to do the heavy
- *   	lifting of validating the packet once it finds that it matches certain
- *   	properties.
+ *	This routine must be defined by plugins of type OVERLAY_TARGET_DYNAMIC.
+ *	It is used to lookup the destination for a given request. Each request
+ *	comes in with its own MAC address this allows a plugin to direct it to
+ *	any remote location.
+ *
+ *	This is designed as an asynchronous API. Once a lookup is completed it
+ *	should call libvarpd_plugin_query_reply() and pass as the second
+ *	argument either VARPD_LOOKUP_OK to indicate that it went alright or it
+ *	should reply VARPD_LOOKUP_DROP to indicate that the packet should be
+ *	dropped.
+ *
+ *	In addition, there are several utility routines that can take care of
+ *	various kinds of traffic automatically. For example, if an ARP, NDP, or
+ *	DHCP packet comes in, there are utilities such as
+ *	libvarpd_plugin_proxy_arp(), libvarpd_plugin_proxy_ndp() and
+ *	libvarpd_plugin_proxy_dhcp(), which allows the system to do the heavy
+ *	lifting of validating the packet once it finds that it matches certain
+ *	properties.
  *
  *   varpd_plugin_arp_f
  *
- *   	This is an optional entry for plugins of type OVERLAY_TARGET_DYNAMIC.
- *   	This is called after a plugin calls libvarpd_plugin_proxy_arp() and is
- *   	used to ask the plugin to perform an ARP or NDP query. The type of query
- *   	is passed in in the third argument, the only valid value for which will
- *   	be VARPD_QTYPE_ETHERNET, to indicate we're doing an Ethernet lookup.
+ *	This is an optional entry for plugins of type OVERLAY_TARGET_DYNAMIC.
+ *	This is called after a plugin calls libvarpd_plugin_proxy_arp() and is
+ *	used to ask the plugin to perform an ARP or NDP query. The type of query
+ *	is passed in in the third argument, the only valid value for which will
+ *	be VARPD_QTYPE_ETHERNET, to indicate we're doing an Ethernet lookup.
  *
- *   	The layer three IP address that is being looked up will be included in
- *   	the struct sockaddr. The sockaddr(3SOCKET)'s sa_family will be set to
- *   	indicate the type, eg. AF_INET or AF_INET6 and that will indicate the
- *   	kind of sockaddr that will be used. For more information see
- *   	sockaddr(3SOCKET). The implementation ensures that enough space for the
- *   	link layer address will exist.
+ *	The layer three IP address that is being looked up will be included in
+ *	the struct sockaddr. The sockaddr(3SOCKET)'s sa_family will be set to
+ *	indicate the type, eg. AF_INET or AF_INET6 and that will indicate the
+ *	kind of sockaddr that will be used. For more information see
+ *	sockaddr(3SOCKET). The implementation ensures that enough space for the
+ *	link layer address will exist.
  *
- *   	This is an asynchronous lookup. Once the answer has been written, a
- *   	plugin should call libvarpd_plugin_arp_reply and if it was successful,
- *   	VARPD_LOOKUP_OK should be passed in and if it failed, VARPD_LOOKUP_DROP
- *   	should be passed in instead.
+ *	This is an asynchronous lookup. Once the answer has been written, a
+ *	plugin should call libvarpd_plugin_arp_reply and if it was successful,
+ *	VARPD_LOOKUP_OK should be passed in and if it failed, VARPD_LOOKUP_DROP
+ *	should be passed in instead.
  *
  *   varpd_plugin_dhcp_f
  *
- *   	This is an optional entry for plugins of type OVERLAY_TARGET_DYNAMIC.
- *   	This is called after a plugin calls the libvarpd_plugin_proxy_dhcp() and
- *   	is used to ask the plugin to determine where is the DHCP server that
- *   	this packet should actually be sent to. What is happening here is that
- *   	rather than broadcast the initial DHCP request, we instead unicast it to
- *   	a specified DHCP server that this operation vector indicates.
- *
- *   	The plugin is given a type, the same as the ARP plugin which indicates
- *   	the kind of link layer address, the only valid type is
- *   	VARPD_QTYPE_ETHERNET, other types should be rejected. Then, like the arp
- *   	entry point, the dhcp entry point should determine the link layer
- *   	address of the DHCP server and write that out in the appropriate memory
- *   	and call libvarpd_plugin_dhcp_reply() when done. Similar to the arp
- *   	entry point, it should use VARPD_LOOKUP_OK to indicate that it was
- *   	filled in and VARPD_LOOKUP_DROP to indicate that it was not.
+ *	This is an optional entry for plugins of type OVERLAY_TARGET_DYNAMIC.
+ *	This is called after a plugin calls the libvarpd_plugin_proxy_dhcp() and
+ *	is used to ask the plugin to determine where is the DHCP server that
+ *	this packet should actually be sent to. What is happening here is that
+ *	rather than broadcast the initial DHCP request, we instead unicast it to
+ *	a specified DHCP server that this operation vector indicates.
+ *
+ *	The plugin is given a type, the same as the ARP plugin which indicates
+ *	the kind of link layer address, the only valid type is
+ *	VARPD_QTYPE_ETHERNET, other types should be rejected. Then, like the arp
+ *	entry point, the dhcp entry point should determine the link layer
+ *	address of the DHCP server and write that out in the appropriate memory
+ *	and call libvarpd_plugin_dhcp_reply() when done. Similar to the arp
+ *	entry point, it should use VARPD_LOOKUP_OK to indicate that it was
+ *	filled in and VARPD_LOOKUP_DROP to indicate that it was not.
  *
  *   varpd_plugin_nprops_f
  *
- *   	This is used by a plugin to indicate the number of properties that
- *   	should exist for this instance. Recall from the section that Plugin
- *   	types and Destinations, that the number of entries here may vary. As
- *   	such, the plugin should return the number that is appropriate for the
- *   	instance.
+ *	This is used by a plugin to indicate the number of properties that
+ *	should exist for this instance. Recall from the section that Plugin
+ *	types and Destinations, that the number of entries here may vary. As
+ *	such, the plugin should return the number that is appropriate for the
+ *	instance.
  *
- *   	This number will be used to obtain information about a property via the
- *   	propinfo functions. However, the getprop and setprop interfaces will
- *   	always use names to indicate the property it is getting and setting.
- *   	This difference is structured this way to deal with property discovery
- *   	and to make the getprop and setprop interfaces slightly easier for other
- *   	parts of the broader varpd/dladm infrastructure.
+ *	This number will be used to obtain information about a property via the
+ *	propinfo functions. However, the getprop and setprop interfaces will
+ *	always use names to indicate the property it is getting and setting.
+ *	This difference is structured this way to deal with property discovery
+ *	and to make the getprop and setprop interfaces slightly easier for other
+ *	parts of the broader varpd/dladm infrastructure.
  *
  *   varpd_plugin_propinfo_f
  *
- *   	This interface is used to get information about a property, the property
- *   	that information is being requested for is being passed in via the
- *   	second argument. Here, callers should set properties such as the name,
- *   	the protection, whether or not the property is required, set any default
- *   	value, if it exist, and if relevant, set the valid range of values.
+ *	This interface is used to get information about a property, the property
+ *	that information is being requested for is being passed in via the
+ *	second argument. Here, callers should set properties such as the name,
+ *	the protection, whether or not the property is required, set any default
+ *	value, if it exist, and if relevant, set the valid range of values.
  *
  *   varpd_plugin_getprop_f
  *
- *   	This is used to get the value of a property, if it is set. The passed in
- *   	length indicates the length of the buffer that is used for updating
- *   	properties. If it is not of sufficient size, the function should return
- *   	an error and not update the buffer. Otherwise, it should update the size
- *   	pointer with the valid size.
+ *	This is used to get the value of a property, if it is set. The passed in
+ *	length indicates the length of the buffer that is used for updating
+ *	properties. If it is not of sufficient size, the function should return
+ *	an error and not update the buffer. Otherwise, it should update the size
+ *	pointer with the valid size.
  *
  *   varpd_plugin_setprop_f
  *
- *   	This is used to set the value of a property. An endpoint should validate
- *   	that the property is valid before updating it. In addition, it should
- *   	update its state as appropriate.
+ *	This is used to set the value of a property. An endpoint should validate
+ *	that the property is valid before updating it. In addition, it should
+ *	update its state as appropriate.
  *
  *   varpd_plugin_save_f
  *
- *   	This is used to serialize the state of a given instance of a plugin such
- *   	that if varpd crashes, it can be recovered. The plugin should write all
- *   	state into the nvlist that it is passed in, it may use any keys and
- *   	values that it wants. The only consumer of that nvlist will be the
- *   	plugin itself when the restore endpoint is called.
+ *	This is used to serialize the state of a given instance of a plugin such
+ *	that if varpd crashes, it can be recovered. The plugin should write all
+ *	state into the nvlist that it is passed in, it may use any keys and
+ *	values that it wants. The only consumer of that nvlist will be the
+ *	plugin itself when the restore endpoint is called.
  *
  *   varpd_plugin_restore_f
  *
- *   	This is called by the server to restore an instance that used to exist,
- *   	but was lost due to a crash. This is a combination of calling create and
- *   	setting properties. The plugin should restore any private state that it
- *   	can find recorded from the nvlist. The only items in the nvlist will be
- *   	those that were written out during a previous call to
- *   	varpd_plugin_save_f.
+ *	This is called by the server to restore an instance that used to exist,
+ *	but was lost due to a crash. This is a combination of calling create and
+ *	setting properties. The plugin should restore any private state that it
+ *	can find recorded from the nvlist. The only items in the nvlist will be
+ *	those that were written out during a previous call to
+ *	varpd_plugin_save_f.
  *
  *
  * Once all of these interfaces are implemented, the plugin should define the
@@ -245,28 +245,28 @@
  *
  *   vpr_version
  *
- *   	This indicates the version of the plugin. Plugins should set this to the
- *   	macro VARPD_CURRENT_VERSION.
+ *	This indicates the version of the plugin. Plugins should set this to the
+ *	macro VARPD_CURRENT_VERSION.
  *
  *   vpr_mode
  *
- *   	This indicates the mode of the plugin. The plugin's mode should be one
- *   	of OVERLAY_TARGET_POINT and OVERLAY_TARGET_DYNAMIC. For more discussion
- *   	of these types and the differences, see the section on Plugin Types and
- *   	Destinations.
+ *	This indicates the mode of the plugin. The plugin's mode should be one
+ *	of OVERLAY_TARGET_POINT and OVERLAY_TARGET_DYNAMIC. For more discussion
+ *	of these types and the differences, see the section on Plugin Types and
+ *	Destinations.
  *
  *   vpr_name
  *
- *   	This is the name of the plugin. This is how users will refer to it in
- *   	the context of running dladm(1M) commands. Note, this name must be
- *   	unique across the different plugins, as it will cause others with the
- *   	same name not to be registered.
+ *	This is the name of the plugin. This is how users will refer to it in
+ *	the context of running dladm(1M) commands. Note, this name must be
+ *	unique across the different plugins, as it will cause others with the
+ *	same name not to be registered.
  *
  *   vpr_ops
  *
- *   	This is the operations vector as described above. Importantly, the
- *   	member vpo_callbacks must be set to zero, this is being used for future
- *   	expansion of the structure.
+ *	This is the operations vector as described above. Importantly, the
+ *	member vpo_callbacks must be set to zero, this is being used for future
+ *	expansion of the structure.
  *
  *
  * --------------------------------------------------
@@ -281,7 +281,7 @@
  * varpd_plugin_lookup_f, varpd_default_f, varpd_plugin_arp_f, and
  * varpd_plugin_dhcp_f will be called until after a call to varpd_plugin_start_f
  * has been called. Similarly, they will not be called after a call to
- * vardp_plugin_stop_f.
+ * varpd_plugin_stop_f.
  *
  * The functions documented in this header may be called back into from any
  * context, including from the operation vectors.
diff --git a/usr/src/lib/varpd/libvarpd/common/libvarpd_util.c b/usr/src/lib/varpd/libvarpd/common/libvarpd_util.c
index e21fed2126..92e50b5f1b 100644
--- a/usr/src/lib/varpd/libvarpd/common/libvarpd_util.c
+++ b/usr/src/lib/varpd/libvarpd/common/libvarpd_util.c
@@ -25,18 +25,12 @@
 const char *
 libvarpd_isaext(void)
 {
-#if defined(__sparc)
-#if defined(__sparcv9)
-	return ("64");
-#else	/* __sparcv9 */
-	return ("");
-#endif /* __sparvc9 */
-#elif defined(__amd64)
+#if defined(__amd64)
 	return ("64");
 #elif defined(__i386)
 	return ("");
 #else
-#error	"unkonwn ISA"
+#error	"unknown ISA"
 #endif
 }
 
diff --git a/usr/src/lib/varpd/libvarpd/i386/Makefile b/usr/src/lib/varpd/libvarpd/i386/Makefile
index f2b4f63da5..4398507523 100644
--- a/usr/src/lib/varpd/libvarpd/i386/Makefile
+++ b/usr/src/lib/varpd/libvarpd/i386/Makefile
@@ -15,4 +15,4 @@
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)